diff --git a/data/data_8107010.s b/data/data_8107010.s index a129b8916..75afb110d 100644 --- a/data/data_8107010.s +++ b/data/data_8107010.s @@ -1,31 +1,7 @@ .section .rodata -@ ??? -.string "pksdir0\0" -@ sub_807218C -.string "pksdir0\0" +.align 2 -.global gUnknown_8107010 -gUnknown_8107010: @ 8107010 -.byte 0, 1, 1, 2, 1, 1, 0, 0 - -.global gUnknown_8107018 -gUnknown_8107018: @ 8107018 -.4byte gUnknown_810702C -.4byte gUnknown_8107028 -.4byte gUnknown_8107024 - -.global gUnknown_8107024 -gUnknown_8107024: @ 8107024 -.byte 0x0a, 0x00, 0x00, 0x00 - -.global gUnknown_8107028 -gUnknown_8107028: @ 8107028 -.byte 0x23, 0x57, 0x0a, 0x00 - -.global gUnknown_810702C -gUnknown_810702C: @ 810702C -.byte 0x00, 0x00, 0x00, 0x00 .string "pksdir0\0" .string "pksdir0\0" .string "pksdir0\0" diff --git a/ld_script.txt b/ld_script.txt index 53d3e911d..3d7a8571d 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -579,6 +579,8 @@ SECTIONS { src/code_806FDF4.o(.rodata); src/status_checks.o(.rodata); src/dungeon_logic.o(.rodata); + src/dungeon_8071B48.o(.rodata); + src/code_80718D8.o(.rodata); data/data_8107010.o(.rodata); src/dungeon_serializer.o(.rodata); data/data_8107224.o(.rodata); diff --git a/src/code_80718D8.c b/src/code_80718D8.c index c790b862b..2d6480dba 100644 --- a/src/code_80718D8.c +++ b/src/code_80718D8.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "constants/tactic.h" #include "dungeon_config.h" #include "dungeon_logic.h" @@ -39,8 +40,6 @@ extern u8 *gUnknown_80F9EC8[]; extern u8 *gUnknown_80F9EEC[]; extern u8 *gUnknown_80FCF18[]; extern u8 *gUnknown_80FF730[]; -extern u8 gUnknown_8107010[8]; -extern u8 *gUnknown_8107018[3]; extern u8 *gUnknown_80FE2EC[]; extern void ResetMonEntityData(EntityInfo *, u32); @@ -60,6 +59,13 @@ void sub_806A3D4(u8 *, s32, s32, s32); extern bool8 sub_803D930(u32); extern void sub_8072B78(Entity *pokemon, Entity *target, s16 id); +static const u8 gUnknown_8107010[8] = {0, 1, 1, 2, 1, 1, 0, 0}; +static const u8 * const gUnknown_8107018[3] = { + _(""), + _("{WAIT_PRESS}\n"), + _("\n"), +}; + void sub_8071D4C(Entity *pokemon, Entity *target, s32 exp) { s32 newExp; diff --git a/src/dungeon_8071B48.c b/src/dungeon_8071B48.c index 2dda84716..f33fd01ab 100644 --- a/src/dungeon_8071B48.c +++ b/src/dungeon_8071B48.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "constants/tactic.h" #include "dungeon_config.h" #include "dungeon_logic.h"