Use globaldata.h to clean "pksdir0" in source

data/data_8106A4C.s

@@ -1,5 +1,10 @@
         .section .rodata
 
+@ sub_8048E04 - sub_805FC30
+        .align 2,0
+        .string "pksdir0\0"
+
+
 	.global gUnknown_8106A4C
 gUnknown_8106A4C: @ 8106A4C
         .4byte 0
@@ -10,7 +15,6 @@ gUnknown_8106A50: @ 8106A50
 
 	.global gUnknown_8106A54
 gUnknown_8106A54: @ 8106A54
-@ replacing .incbin "baserom.gba", 0x106A54, 0x38
 .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
 .byte 0x80, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
 .byte 0x80, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
@@ -18,7 +22,6 @@ gUnknown_8106A54: @ 8106A54
 
 	.global gUnknown_8106A8C
 gUnknown_8106A8C: @ 8106A8C
-@ replacing .incbin "baserom.gba", 0x106A8C, 0x3C
 .byte 0x06, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00
 .byte 0x18, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64
 .byte 0x69, 0x72, 0x30, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00, 0x70, 0x6b, 0x73, 0x64
@@ -26,7 +29,6 @@ gUnknown_8106A8C: @ 8106A8C
 
 	.global gUnknown_8106AC8
 gUnknown_8106AC8: @ 8106AC8
-@ replacing .incbin "baserom.gba", 0x106AC8, 0x20
 .byte 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00
 .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
 
@@ -36,7 +38,6 @@ gUnknown_8106AE8: @ 8106AE8
 
 	.global gUnknown_8106AEC
 gUnknown_8106AEC: @ 8106AEC
-@ replacing .incbin "baserom.gba", 0x106AEC, 0x64
 .byte 0x12, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x13, 0x02, 0x00, 0x00
 .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 .byte 0x01, 0x00, 0xff, 0xff, 0x13, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff
@@ -48,6 +49,10 @@ gUnknown_8106AEC: @ 8106AEC
 	.global gUnknown_8106B50
 gUnknown_8106B50: @ 8106B50
         .string "{COLOR_1}%c%s\0"
+
+
+
+@ CreateFieldItemMenu - sub_8062CA8
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -58,13 +63,11 @@ gUnknown_8106B60: @ 8106B60
 
 	.global gUnknown_8106B6C
 gUnknown_8106B6C: @ 8106B6C
-@ replacing .incbin "baserom.gba", 0x106B6C, 0x20
 .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x06, 0x00, 0x02, 0x00
 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
 
 	.global gUnknown_8106B8C
 gUnknown_8106B8C: @ 8106B8C
-@ replacing .incbin "baserom.gba", 0x106B8C, 0x24
 .byte 0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x38, 0x00
 .byte 0x68, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00
@@ -180,6 +183,9 @@ gUnknown_8106C98: @ 8106C98
 	.global gUnknown_8106C9C
 gUnknown_8106C9C: @ 8106C9C
         .string "None\0"
+
+
+@ sub_80633E4 - sub_80639E4
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -205,12 +211,19 @@ gUnknown_8106CC8: @ 8106CC8
 	.global gUnknown_8106CCC
 gUnknown_8106CCC: @ 8106CCC
         .string "{ARG_POKEMON_0}\0"
+
+@ ???
         .align 2,0
         .string "pksdir0\0"
+
+@ ???
         .align 2,0
         .string "pksdir0\0"
+
+@ CreateFieldDungeonMenu - CreateFieldOthersMenu
         .align 2,0
         .string "pksdir0\0"
+
         .align 2,0
 
 	.global gUnknown_8106CE8
@@ -224,6 +237,8 @@ gUnknown_8106CF4: @ 8106CF4
         .byte 0x13, 0x00, 0x00, 0x00
         .byte 0x11, 0x00, 0x00, 0x00
         .byte 0x19, 0x00, 0x00, 0x00
+
+@ sub_8065FB4 - sub_8066358
         .string "pksdir0\0"
         .align 2,0
 
@@ -241,8 +256,12 @@ gUnknown_8106D68: @ 8106D68
 	.global gUnknown_8106D8C
 gUnknown_8106D8C: @ 8106D8C
         .string "{COLOR_2}%d{ARG_POKEMON_0}\0"
+
+@ ???
         .align 2,0
         .string "pksdir0\0"
+
+@ sub_8067A80 - sub_806806C
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
@@ -299,6 +318,8 @@ gUnknown_8106E80: @ 8106E80
         .byte 0x03, 0x00, 0x00, 0x00
         .byte 0x04, 0x00, 0x00, 0x00
         .byte 0x05, 0x00, 0x00, 0x00
+
+@ sub_8068614 - sub_806A3D4
         .string "pksdir0\0"
         .align 2,0
 
@@ -320,22 +341,24 @@ gUnknown_8106EA8: @ 8106EA8
 	.global gUnknown_8106EB0
 gUnknown_8106EB0: @ 8106EB0
         .string "talk%d\0"
+
+@ ???
         .align 2,0
         .string "pksdir0\0"
+
+@ sub_806C51C - sub_806E100
         .align 2,0
         .string "pksdir0\0"
         .align 2,0
 
 	.global gUnknown_8106EC8
 gUnknown_8106EC8: @ 8106EC8
-@ replacing .incbin "baserom.gba", 0x106EC8, 0x27
 .byte 0x00, 0x01, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07
 .byte 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x05
 .byte 0x06, 0x07, 0x07, 0x07, 0x07, 0x0b, 0x07
 
 	.global gUnknown_8106EEF
 gUnknown_8106EEF: @ 8106EEF
-@ replacing .incbin "baserom.gba", 0x106EEF, 0xD
 .byte 0x03, 0x04, 0x05, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
 
 	.global gUnknown_8106EFC
@@ -365,7 +388,6 @@ gUnknown_8106F1C: @ 8106F1C
 
 	.global gUnknown_8106F24
 gUnknown_8106F24: @ 8106F24
-@ replacing .incbin "baserom.gba", 0x106F24, 0x30
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, 0x01, 0x00
         .global gUnknown_8106F3C

include/globaldata.h

@@ -0,0 +1,8 @@
+// This file exists because every file introduces this string into the (.rodata).
+// There was no #ifdef guard in this file in the source, which is why it happens for every source file.
+// Luckily, this tells us where file boundaries are exactly.
+// This file gets included by each source file, just like in Chunsoft's original source, so we can have this string easily just like they did.
+
+// Later, we can move this into "global.h" before the #ifdef guard. But we can only do this if "global.h" isn't included outside of .c files...
+
+ALIGNED(4) static const u8 sFill[] = _("pksdir0");

ld_script.txt

@@ -500,6 +500,7 @@ SECTIONS {
         src/debug_menu4.o(.rodata);
         data/data_80E7D40.o(.rodata);
         src/pokemon_mail.o(.rodata);
+        src/code_803C1B4.o(.rodata);
         data/personality_test.o(.rodata);
         src/personality_test.o(.rodata);
         src/code_803D0D8.o(.rodata);

src/adventure_log.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "adventure_log.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"

src/charge_move.c

@@ -39,8 +39,6 @@ const u32 gMultiTurnChargingStatuses[10] = {
     STATUS_NONE
 };
 
-ALIGNED(4) const char chargingStatusFill[] = "pksdir0";
-
 u32 sub_8057070(Move *move)
 {
     u32 numberOfChainedHits;

src/code_801602C.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_8012A18_1.h"
 #include "code_80130A8.h"
 #include "code_801602C.h"

src/code_801AFA4.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "code_801AFA4.h"

src/code_801B3C0.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "code_801B3C0.h"

src/code_801B60C.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "code_801B3C0.h"

src/code_801BEEC.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_801BEEC.h"
 #include "code_801C244.h"

src/code_801C244.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "code_801C244.h"

src/code_801C620.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "code_801C620.h"

src/code_801C8C4.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_801C8C4.h"
 #include "input.h"

src/code_801D014.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "bg_palette_buffer.h"
 #include "code_800D090.h"
 #include "code_80130A8.h"

src/code_801D9E4.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_801D9E4.h"
 #include "constants/input.h"

src/code_80227B8.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80130A8.h"
 #include "code_801AFA4.h"
 #include "code_801B3C0.h"

src/code_8023144.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_800D090.h"
 #include "code_80118A4.h"
 #include "code_8023144.h"

src/code_8023868.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_800D090.h"
 #include "code_8023868.h"
 #include "pokemon.h"

src/code_8024458.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_8024458.h"
 #include "constants/input.h"

src/code_802DB28.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80130A8.h"
 #include "code_802DB28.h"
 #include "code_802F204.h"

src/code_802DE84.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_802DE84.h"
 #include "code_803B050.h"

src/code_8031D70.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "constants/wonder_mail.h"
 #include "constants/colors.h"
 #include "input.h"

src/code_803C1B4.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "dungeon.h"
 
 u32 sub_803C1B4(DungeonLocation *dungeon, u8 r1)

src/code_803D0D8.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_803D0D8.h"
 
 static EWRAM_DATA_2 u8 sUnknown_203B408 = {0};

src/common_strings.c

@@ -1,8 +1,7 @@
 #include "global.h"
+#include "globaldata.h"
 #include "common_strings.h"
 
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 // Probably had many entries per ptr because of languages, but USA release is english-only. Check other roms
 
 ALIGNED(4) static const u8 sYes0[] = _("Yes");

src/credits2.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "credits2.h"
 #include "event_flag.h"
 #include "input.h"

src/data/adventure_log.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E1FF0 =
 {
     0, 0, 0, 0,

src/data/code_801602C.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 enum
 {
     MENU_ACTION_DEFAULT = 1,

src/data/code_801AFA4.h

@@ -1,11 +1,11 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 ALIGNED(4) static const u8 sFmtWhoWillLearnTheMove[] = _(
     "{CENTER_ALIGN}Who will learn the move\n"
     "{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?");
+
 ALIGNED(4) static const u8 sFmtLearnedTheMove[] = _(
     "{CENTER_ALIGN}{COLOR_1 CYAN_3}{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned\n"
     "{CENTER_ALIGN}the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!");
+
 ALIGNED(4) static const u8 sFmtNoOneCanLearnThisMove[] = _(
     "{CENTER_ALIGN}No one in the current team\n"
     "{CENTER_ALIGN}can learn this move. ");

src/data/code_801B3C0.h

@@ -1,3 +1 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 ALIGNED(4) static const u8 sFmtPkmn0[] = _("{ARG_POKEMON_0}");

src/data/code_801B60C.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBA58 = {
     0, 0, 0, 0,
     3,
@@ -8,6 +6,7 @@ static const UnkTextStruct2 sUnknown_80DBA58 = {
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DBA70 = {
     0, 0, 0, 0,
     3,
@@ -16,6 +15,7 @@ static const UnkTextStruct2 sUnknown_80DBA70 = {
     3, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DBA88 = {
     0, 0, 0, 0,
     3,
@@ -28,37 +28,48 @@ static const UnkTextStruct2 sUnknown_80DBA88 = {
 ALIGNED(4) static const u8 sFmtReceivedThePromised[] = _(
     "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n"
     "{CENTER_ALIGN}the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}. ");
+
 ALIGNED(4) static const u8 sFmtTeamReceivedThePromised[] = _(
     "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n"
     "{CENTER_ALIGN}the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.");
+
 ALIGNED(4) static const u8 sFmtTeamAlsoReceived[] = _(
     "{CENTER_ALIGN}The team also received\n"
     "{CENTER_ALIGN}the item {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.");
+
 ALIGNED(4) static const u8 sFmtReceivedStatue[] = _(
     "{CENTER_ALIGN}Received the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!{EXTRA_MSG}{CENTER_ALIGN}A very rare statue. It has been placed\n"
     "{CENTER_ALIGN}outside your rescue team base.");
+
 ALIGNED(4) static const u8 sFmtReceive1000Instead[] = _(
     "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n"
     "{CENTER_ALIGN}You{APOSTROPHE}ve already acquired it.{EXTRA_MSG}{CENTER_ALIGN}Sorry to see that...{EXTRA_MSG}{CENTER_ALIGN}In its place{COMMA} {COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{COMMA}\n"
     "{CENTER_ALIGN}you can have {COLOR_1 LIGHT_BLUE}1{COMMA}000{END_COLOR_TEXT_1} {POKE}.");
+
 ALIGNED(4) static const u8 sFmtFullSoSentToStorage[] = _(
     "{CENTER_ALIGN}Your Toolbox is full.\n"
     "{CENTER_ALIGN}The item was sent to storage.");
+
 ALIGNED(4) static const u8 sFmtFullSoPrompt[] = _(
     "{CENTER_ALIGN}Your Toolbox is full.\n"
     "{CENTER_ALIGN}What would you like to do?");
+
 ALIGNED(4) static const u8 sFmtConfirmThrowAway[] = _(
     "{CENTER_ALIGN}Is it OK to throw away\n"
     "{CENTER_ALIGN}this {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?");
+
 ALIGNED(4) static const u8 sFmtThrownAway[] = _(
     "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\n"
     "{CENTER_ALIGN}was thrown away.");
+
 ALIGNED(4) static const u8 sFmtPutInStorageForReceive[] = _(
     "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was put in\n"
     "{CENTER_ALIGN}storage to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.");
+
 ALIGNED(4) static const u8 sFmtDiscardedForReceive[] = _(
     "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was discarded\n"
     "{CENTER_ALIGN}to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.");
+
 ALIGNED(4) static const u8 sTrashToolboxItem[] = _("Trash Toolbox Item");
 ALIGNED(4) static const u8 sTrashReceivedItem[] = _("Trash Received Item");
 ALIGNED(4) static const u8 sStorage[] = _("Storage");

src/data/code_801BEEC.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBD98 = {
     0, 0, 0, 0,
     3,
@@ -8,6 +6,7 @@ static const UnkTextStruct2 sUnknown_80DBD98 = {
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DBDB0 = {
     0, 0, 0, 0,
     3,

src/data/code_801C244.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBDD8 = {
     0, 0, 0, 0,
     3,
@@ -8,6 +6,7 @@ static const UnkTextStruct2 sUnknown_80DBDD8 = {
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DBDF0 = {
     0, 0, 0, 0,
     6,

src/data/code_801C620.h

@@ -1,4 +1,2 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 ALIGNED(4) static const u8 sFmtMoveItem0[] = _("{ARG_MOVE_ITEM_0}");
 ALIGNED(4) static const u8 sFmtPkmn0[] = _("{ARG_POKEMON_0}");

src/data/code_801C8C4.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBE3C = {
     0, 0, 0, 0,
     3,
@@ -8,6 +6,7 @@ static const UnkTextStruct2 sUnknown_80DBE3C = {
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DBE54 = {
     0, 0, 0, 0,
     6,

src/data/code_801D014.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBE7C = {
     0, 0, 0, 0,
     3,

src/data/code_801D9E4.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBF70 = {
     0, 0, 0, 0,
     3,
@@ -8,6 +6,7 @@ static const UnkTextStruct2 sUnknown_80DBF70 = {
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DBF88 = {
     0, 0, 0, 0,
     6,

src/data/code_80227B8.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const MenuItem sUnknown_80DC584[3] =
 {
     {"Yes", 2},

src/data/code_8023144.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC904 =
 {
     0, 0, 0, 0,
@@ -9,6 +7,7 @@ static const UnkTextStruct2 sUnknown_80DC904 =
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80DC91C =
 {
     0, 0, 0, 0,

src/data/code_8023868.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 //static // MAKE STATIC WHEN code_8023868.s IS DONE
 const UnkTextStruct2 sUnknown_80DC950 = {
     0, 0, 0, 0,

src/data/code_8024458.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC9B0 = {
     0, 0, 0, 0,
     3,

src/data/code_802DB28.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E016C = {
     0, 0, 0, 0,
     3,

src/data/code_802DE84.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E0248 = {
     0, 0, 0, 0,
     3,

src/data/code_803D0D8.h

@@ -1,43 +1,41 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const u8 sUnknown_80F42D0[32] = {
-	0x3f, 0x36, 0x37, 0x4e, 0x50, 0x52, 0x38, 0x39,
-	0x46, 0x30, 0x2b, 0x85, 0x53, 0x54, 0x58, 0x59,
-	0x34, 0x35, 0x4d, 0x43, 0x48, 0x4a, 0x2d, 0x4b,
-	0x31, 0x32, 0x21, 0xbe, 0x33, 0x51, 0xbd, 0x57
+    0x3f, 0x36, 0x37, 0x4e, 0x50, 0x52, 0x38, 0x39,
+    0x46, 0x30, 0x2b, 0x85, 0x53, 0x54, 0x58, 0x59,
+    0x34, 0x35, 0x4d, 0x43, 0x48, 0x4a, 0x2d, 0x4b,
+    0x31, 0x32, 0x21, 0xbe, 0x33, 0x51, 0xbd, 0x57
 };
 
 static const u8 sUnknown_80F42F0[256] = {
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0x0a, 0xff, 0x16, 0xff, 0xff,
-	0x09, 0x18, 0x19, 0x1c, 0x10, 0x11, 0x01, 0x02,
-	0x06, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-	0xff, 0xff, 0xff, 0x13, 0xff, 0xff, 0x08, 0xff,
-	0x14, 0xff, 0x15, 0x17, 0xff, 0x12, 0x03, 0xff,
-	0x04, 0x1d, 0x05, 0x0c, 0x0d, 0xff, 0xff, 0x1f,
-	0x0e, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x0b, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x1b, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x0a, 0xff, 0x16, 0xff, 0xff,
+    0x09, 0x18, 0x19, 0x1c, 0x10, 0x11, 0x01, 0x02,
+    0x06, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+    0xff, 0xff, 0xff, 0x13, 0xff, 0xff, 0x08, 0xff,
+    0x14, 0xff, 0x15, 0x17, 0xff, 0x12, 0x03, 0xff,
+    0x04, 0x1d, 0x05, 0x0c, 0x0d, 0xff, 0xff, 0x1f,
+    0x0e, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x0b, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x1b, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };

src/data/credits2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 // Inputs related. These are probably buttons OR'd together
 static const u16 sUnknown_80E5990[8] =
 {

src/data/debug_menu2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E7E34 =
 {
     0, 0, 0, 0,
@@ -9,6 +7,7 @@ static const UnkTextStruct2 sUnknown_80E7E34 =
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80E7E4C =
 {
     0, 0, 0, 0,
@@ -18,6 +17,7 @@ static const UnkTextStruct2 sUnknown_80E7E4C =
     3, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80E7E64 =
 {
     0, 0, 0, 0,

src/data/debug_menu3.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E7E8C =
 {
     0, 0, 0, 0,
@@ -9,6 +7,7 @@ static const UnkTextStruct2 sUnknown_80E7E8C =
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80E7EA4 =
 {
     0, 0, 0, 0,

src/data/debug_menu4.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E7ED4 =
 {
     0, 0, 0, 0,
@@ -9,6 +7,7 @@ static const UnkTextStruct2 sUnknown_80E7ED4 =
     0, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80E7EEC =
 {
     0, 0, 0, 0,
@@ -18,6 +17,7 @@ static const UnkTextStruct2 sUnknown_80E7EEC =
     3, 0,
     NULL
 };
+
 static const UnkTextStruct2 sUnknown_80E7F04 =
 {
     0, 0, 0, 0,

src/data/decompress.h

@@ -1,4 +1 @@
-
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const u32 gByteShiftLookup[4] = {0, 8, 16, 24};

src/data/felicity_bank.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB6DC = {
     0, 0, 0, 0,
     3,

src/data/friend_area_action_menu.h

@@ -79,5 +79,4 @@ ALIGNED(4) static const u8 sSummary[] = "Summary";
 ALIGNED(4) static const u8 sMoves[] = "Moves";
 ALIGNED(4) static const u8 sCheckIQ[] = "Check IQ";
 
-ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} ");
-static const u8 sFill1[] = "pksdir0";
+ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} ");

src/data/friend_list_menu.h

@@ -62,5 +62,4 @@ ALIGNED(4) static const u8 sName[] = "Name";
 ALIGNED(4) static const u8 sSummary[] = "Summary";
 ALIGNED(4) static const u8 sMoves[] = "Moves";
 ALIGNED(4) static const u8 sCheckIQ[] = "Check IQ";
-ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} ");
-ALIGNED(4) static const u8 sFill[] = "pksdir0";
+ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} ");

src/data/gulpin_shop.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 gUnknown_80DC11C = {
     0, 0, 0, 0,
     3,

src/data/gulpin_shop_801FB50.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 gUnknown_80DC31C = {
     0, 0, 0, 0,
     3,

src/data/hints_menu1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC0A0 = {
     0, 0, 0, 0,
     3,

src/data/hints_menu2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC0E4 = {
     0, 0, 0, 0,
     3,

src/data/kangaskhan_storage1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB748 = {
     0, 0, 0, 0,
     3,

src/data/kangaskhan_storage2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB7B8 = {
     0, 0, 0, 0,
     3,

src/data/kecleon_bros1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB840 = {
     0, 0, 0, 0,
     3,

src/data/kecleon_bros2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB8B4 = {
     0, 0, 0, 0,
     3,

src/data/kecleon_bros3.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB8FC = {
     0, 0, 0, 0,
     3,

src/data/kecleon_bros4.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DB944 = {
     0, 0, 0, 0,
     3,

src/data/luminous_cave.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC9E8 = {
     0, 0, 0, 0,
     3,
@@ -130,6 +128,5 @@ ALIGNED(4) static const u8 sMustGiveName[] = _(
     "{CENTER_ALIGN}Ye must give a name to\n"
     "{CENTER_ALIGN}the evolved Pokémon. ");
 
-// TODO: These are for 2 files after, which have no data
-ALIGNED(4) static const u8 sFill1[] = _("pksdir0");
-ALIGNED(4) static const u8 sFill2[] = _("pksdir0");
+// TODO: This for a file after which had no data
+ALIGNED(4) static const u8 sFill1[] = _("pksdir0");

src/data/main_menu1.h

@@ -1,5 +1,3 @@
-static const u8 sFill[] = "pksdir0";
-
 static const UnkTextStruct2 sUnknown_80E59A8 = {
    0, 0, 0, 0,
    3,

src/data/main_menu2.h

@@ -1,5 +1,3 @@
-static const u8 sFill[] = "pksdir0";
-
 static const UnkTextStruct2 sUnknown_80E59C8 = {
     0, 0, 0, 0,
     3,

src/data/makuhita_dojo1.h

@@ -11,5 +11,5 @@ ALIGNED(4) static const u8 sReceivedBonslyDoll[] = _(
     "{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_NICKNAME_0}{END_COLOR_TEXT_1} received the {COLOR_1 GREEN_2}Bonsly Doll{END_COLOR_TEXT_1}!\n"
     "{CENTER_ALIGN}It has been placed outside your\n"
     "{CENTER_ALIGN}rescue team base.");
-ALIGNED(4) static const u8 sGoTrain[] = _("Go Train");
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+
+ALIGNED(4) static const u8 sGoTrain[] = _("Go Train");

src/data/makuhita_dojo2.h

@@ -18,5 +18,4 @@ static const UnkTextStruct2 sUnknown_80E0804 = {
 
 ALIGNED(4) static const u8 sCourses[] = _("Courses");
 ALIGNED(4) static const u8 sStarBullet[] = _("{STAR_BULLET}");
-ALIGNED(4) static const u8 sFmtColor[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}");
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+ALIGNED(4) static const u8 sFmtColor[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}");

src/data/options_menu1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DBFB0 = {
     0, 0, 0, 0,
     3,

src/data/options_menu2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC020 = {
     0, 0, 0, 0,
     3,

src/data/other_menus1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80E653C = {
     0, 0, 0, 0,
     3,

src/data/other_menus2.h

@@ -1,8 +1,7 @@
-ALIGNED(4) static const u8 sFill[] = "pksdir0";
-ALIGNED(4) const u8 gUnknown_80E6E50[] = "CHUNSOFT"; // TODO: MAKE STATIC WHEN other_menus2.s IS DED
+ALIGNED(4) const u8 gUnknown_80E6E50[] = _("CHUNSOFT"); // TODO: MAKE STATIC WHEN other_menus2.s IS DED
 
 // TODO: These belongs to files after
-ALIGNED(4) static const u8 fill1[] = "pksdir0";
-ALIGNED(4) static const u8 fill2[] = "pksdir0";
-ALIGNED(4) static const u8 fill3[] = "pksdir0";
-ALIGNED(4) static const u8 fill4[] = "pksdir0";
+ALIGNED(4) static const u8 fill1[] = _("pksdir0");
+ALIGNED(4) static const u8 fill2[] = _("pksdir0");
+ALIGNED(4) static const u8 fill3[] = _("pksdir0");
+ALIGNED(4) static const u8 fill4[] = _("pksdir0");

src/data/party_list_menu.h

@@ -103,5 +103,4 @@ ALIGNED(4) static const u8 sPartyMenuSummary[] = "Summary";
 ALIGNED(4) static const u8 sPartyMenuMoves[] = "Moves";
 ALIGNED(4) static const u8 sPartyMenuCheckIQ[] = "Check IQ";
 ALIGNED(4) static const u8 sPartyMenuItemPlaceholder[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} ");
-ALIGNED(4) static const u8 sUnknown_80DD6E0[] = "%s";
-ALIGNED(4) static const u8 sFill[] = "pksdir0";
+ALIGNED(4) static const u8 sUnknown_80DD6E0[] = "%s";

src/data/pokemon_mail.h

@@ -1173,6 +1173,4 @@ ALIGNED(4) const u8 gMail_WelcomeText[] = _(
     "ranking. Aim for the Bronze Rank for now!\n"
     "   - Pokémon Rescue Organization -");
 
-ALIGNED(4) const u8 gMail_WelcomeHeadline[] = "#1 Welcome to a Rescue Team!";
-
-static const u8 pokemon_mail_fill[] = "pksdir0";
+ALIGNED(4) const u8 gMail_WelcomeHeadline[] = "#1 Welcome to a Rescue Team!";

src/data/pokemon_news1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFBD0 = {
     0, 0, 0, 0,
     3,

src/data/pokemon_news2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFC18 = {
     0, 0, 0, 0,
     3,

src/data/pokemon_news3.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFC5C = {
     0, 0, 0, 0,
     3,

src/data/post_office_guide1.h

@@ -272,6 +272,4 @@ ALIGNED(4) static const u8 sDeletingMailExplanation[] =
     "you won{APOSTROPHE}t be able to receive more mail.\n"
     "That{APOSTROPHE}s why you{APOSTROPHE}ll need to delete old mail.{EXTRA_MSG}"
     " You can look through old\n"
-    "mail at the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} over there.");
-
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
+    "mail at the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} over there.");

src/data/post_office_guide2.h

@@ -27,5 +27,4 @@ ALIGNED(4) static const u8 sJustGo[] = "Just go!";
 ALIGNED(4) static const u8 sFmtBring[] = _("  Bring {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}");
 ALIGNED(4) static const u8 sFmtFind[] = _("  Find {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}");
 ALIGNED(4) static const u8 sFmtEscort[] = _("  Escort to {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}");
-ALIGNED(4) static const u8 sRedQuestionMarks[] = _("{COLOR_1 RED_2}???{END_COLOR_TEXT_1}");
-ALIGNED(4) static const u8 sFill[] = "pksdir0";
+ALIGNED(4) static const u8 sRedQuestionMarks[] = _("{COLOR_1 RED_2}???{END_COLOR_TEXT_1}");

src/data/quick_save_read.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 ALIGNED(4) static const u8 sSaveFailedExplanation[] = _(
     "{CENTER_ALIGN}Your data was not properly saved{COMMA}\n"
     "{CENTER_ALIGN}so your game cannot be resumed\n"

src/data/quick_save_write.h

@@ -1,15 +1,13 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
-ALIGNED(4) static const u8 gUnknown_80D45AC[] = _(
+ALIGNED(4) static const u8 sUnknown_80D45AC[] = _(
     "{CENTER_ALIGN}Quicksaving your adventure...\n"
     "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power.");
 
-ALIGNED(4) static const u8 gUnknown_80D45F4[] = _(
+ALIGNED(4) static const u8 sUnknown_80D45F4[] = _(
     "{CENTER_ALIGN}Your adventure has been saved.\n"
     "{CENTER_ALIGN}When you are in a dungeon{COMMA} quicksave\n"
     "{CENTER_ALIGN}your progress before ending the game.");
 
-ALIGNED(4) static const u8 gUnknown_80D4668[] = _(
+ALIGNED(4) static const u8 sUnknown_80D4668[] = _(
     "{CENTER_ALIGN}Your adventure has been saved.\n"
     "{CENTER_ALIGN}When you resume play{COMMA} the quicksave\n"
     "{CENTER_ALIGN}data will be deleted.{EXTRA_MSG}"
@@ -17,9 +15,9 @@ ALIGNED(4) static const u8 gUnknown_80D4668[] = _(
     "{CENTER_ALIGN}save your progress in your team base{COMMA}\n"
     "{CENTER_ALIGN}or quicksave in a dungeon.");
 
-ALIGNED(4) static const u8 gSaveNotWritten2[] = _(
+ALIGNED(4) static const u8 sSaveNotWritten[] = _(
     "{CENTER_ALIGN}The data could not be written.\n"
     "{CENTER_ALIGN}Please turn off the power and remove\n"
     "{CENTER_ALIGN}and reinsert the DS Card.");
 
-ALIGNED(4) static const u8 gSaveFailed2[] = _("{CENTER_ALIGN}Save failed.");
+ALIGNED(4) static const u8 sSaveFailed[] = _("{CENTER_ALIGN}Save failed.");

src/data/save_read.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 ALIGNED(4) static const u8 sSaveCorrupted[] = _(
     "{CENTER_ALIGN}The game data is corrupted.\n"
     "{CENTER_ALIGN}Your data will be erased.");

src/data/save_write.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 ALIGNED(4) static const u8 sSavingAdventure[] = _(
     "{CENTER_ALIGN}Saving your adventure...\n"
     "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power.");

src/data/thank_you_wonder_mail.h

@@ -172,6 +172,4 @@ ALIGNED(4) const u8 gUnknown_80DF96C[] = _(
 
 ALIGNED(4) const u8 gUnknown_80DF9A4[]= _(
 	" How would you like to\n"
-	"receive your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?");
-
-ALIGNED(4) const u8 thank_you_fill[] = "pksdir0";
+	"receive your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE}Thank-You Mail{END_COLOR_TEXT_1}?");

src/data/trade_items_menu.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const MenuItem sUnknown_80E60A0[3] = {
     {"Send item", 1},
     {"Receive item", 2},

src/data/wigglytuff_shop1.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC464 = {
     0, 0, 0, 0,
     3,

src/data/wigglytuff_shop2.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC4BC = {
     0, 0, 0, 0,
     3,

src/data/wigglytuff_shop3.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DC534 = {
     0, 0, 0, 0,
     3,

src/data/wonder_mail_1.h

@@ -1,3 +1,101 @@
+
+
+const MenuItem gUnknown_80DD970[] =
+{
+    {"Receive SOS Mail", 0x0},
+    {"Leave for Rescue", 0x1},
+    {"Send A-OK Mail", 0x2},
+    {"Delete Mail", 0x3},
+    {"Cancel", 0xA},
+    {NULL, 0xA}
+};
+
+const MenuItem gUnknown_80DD9EC[] =
+{
+    {"Delete SOS Mail", 0x5},
+    {"Delete A-OK Mail", 0x6},
+    {"Delete All Mail", 0x7},
+    {"Cancel", 0xA},
+    {NULL, 0xA}
+};
+
+const MenuItem gUnknown_80DDA48[] =
+{
+    {"Yes", 0x8},
+    {"Cancel", 0xA},
+    {NULL, 0xA}
+};
+
+const MenuItem gUnknown_80DDA64[] =
+{
+    {"Yes", 0x8},
+    {"No", 0x9},
+    {NULL, 0xA}
+};
+
+const MenuItem gUnknown_80DDA80[] =
+{
+    {"Yes", 0x8},
+    {"No", 0x9},
+    {"Cancel", 0xA},
+    {NULL, 0xA}
+};
+
+const MenuItem gUnknown_80DDAA0[] =
+{
+    {SendWOPokemon, 0x12},
+    {"Cancel", 0xA},
+    {NULL, 0xA},
+};
+
+ALIGNED(4) const u8 SendWOPokemon[] = _("Send w/o Pokémon");
+
+const UnkTextStruct2 gUnknown_80DDACC =
+{
+    0x00, 0x00, 0x00, 0x00,
+    0x03,
+    0x16, 0x07,
+    0x06, 0x04,
+    0x04, 0x00,
+    NULL
+};
+
+const UnkTextStruct2 gUnknown_80DDAE4 =
+{
+    0x00, 0x00, 0x00, 0x00,
+    0x03,
+    0x16, 0x06,
+    0x06, 0x04,
+    0x04, 0x00,
+    NULL
+};
+
+const MenuItem gUnknown_80DDAFC[] =
+{
+    {"Confirm", 0xB},
+    {"Info", 0xC},
+    {NULL, 0xA},
+};
+
+const MenuItem gUnknown_80DDB24[] =
+{
+    {"Game Link cable", 0xD},
+    {"Password", 0xF},
+    {"Cancel", 0xA},
+    {NULL, 0xA},
+};
+
+const MenuItem gUnknown_80DDB60[] =
+{
+    {SendPokemon_80DDB98, 0x11},
+    {DontSendPokemon_80DDB80, 0x12},
+    {"Cancel", 0xA},
+    {NULL, 0xA},
+};
+
+ALIGNED(4) const u8 DontSendPokemon_80DDB80[] = _("Don{APOSTROPHE}t Send Pokémon");
+ALIGNED(4) const u8 SendPokemon_80DDB98[] = _("Send Pokémon");
+
 ALIGNED(4) const char gUnknown_80DDBA8[] = _(
 	" What you need to do is\n"
 	"tell your friend--the one you rescued--\n"
@@ -254,6 +352,4 @@ ALIGNED(4) const char gWonderMailSOSPasswordIncorrectText[] = _(
 
 ALIGNED(4) const char gWonderMailAOKMailReceivedText[] = _(
 	 ": I received the {COLOR_1 LIGHT_BLUE}SOS Mail{END_COLOR_TEXT_1}.\n"
-	 "Your adventure will be saved.");
-
-ALIGNED(4) const char mail_filler[] = _("pksdir0");
+	 "Your adventure will be saved.");

src/data/wonder_mail_802C10C.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFC9C = {
     0, 0, 0, 0,
     3,

src/data/wonder_mail_802C4C8.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFCE4 = {
     0, 0, 0, 0,
     3,

src/data/wonder_mail_802C860.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFD28 = {
     0, 0, 0, 0,
     3,

src/data/wonder_mail_802CDD4.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFD8C = {
     0, 0, 0, 0,
     3,

src/data/wonder_mail_802D098.h

@@ -1,5 +1,3 @@
-ALIGNED(4) static const u8 sFill[] = _("pksdir0");
-
 static const UnkTextStruct2 sUnknown_80DFDD4 = {
     0, 0, 0, 0,
     3,

src/data/wonder_mail_main_menu.h

@@ -1,3 +1,36 @@
+
+
+const MenuItem gSelectWonderMailModeMainMenuItems[3] =
+{
+    {"Send", WONDER_MAIL_MODE_SEND},
+    {"Receive", WONDER_MAIL_MODE_RECEIVE},
+    {NULL, 0}
+};
+
+const MenuItem gSendWonderMailMainMenuItems[4] =
+{
+    {"Game Link cable", WONDER_MAIL_GAME_LINK},
+    {"Password", -1},
+    {"Cancel", 8},
+    {NULL, 0}
+
+};
+
+const MenuItem gReceiveWonderMailMainMenuItems[4] =
+{
+    {"Game Link cable", WONDER_MAIL_GAME_LINK},
+    {"Password", WONDER_MAIL_PASSWORD},
+    {"Cancel", 8},
+    {NULL, 0}
+};
+
+const MenuItem gUnknown_80E78F8[3] =
+{
+    {"Yes", 6},
+    {"Cancel", 0},
+    {NULL, 0}
+};
+
 ALIGNED(4) const char gUnknown_80E7914[] = "There was a communication error.";
 
 ALIGNED(4) const char gUnknown_80E7938[] = "An incorrect number of GBA systems are\n"
@@ -46,4 +79,23 @@ ALIGNED(4) const char gUnknown_80E7C98[] = _("Please enter the\n"
 ALIGNED(4) const char gUnknown_80E7CC4[] = "This password is incorrect.\n"
                                            "Would you like to enter it again?";
 
+// UNUSED DEBUG MENU DUMMY A:
+
 ALIGNED(4) const char wonder_mail_main_fill0[] = "pksdir0";
+
+extern const char Cancel_80E7D24[];
+extern const char Yes_80E7D2C[];
+
+const MenuItem WonderMailMainUnused[3] =
+{
+    {Yes_80E7D2C, 1},
+    {Cancel_80E7D24, 0},
+    {NULL, 0},
+};
+
+ALIGNED(4) const char Cancel_80E7D24[] = "Cancel";
+ALIGNED(4) const char Yes_80E7D2C[] = "Yes";
+
+// UNUSED DEBUG MENU DUMMY B:
+
+ALIGNED(4) const char wonder_mail_main_fill1[] = "pksdir0";

src/debug_menu2.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80130A8.h"
 #include "code_801B3C0.h"
 #include "code_801C8C4.h"

src/debug_menu3.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_801EE10_mid.h"
 #include "common_strings.h"
 #include "debug_menu3.h"

src/debug_menu4.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80130A8.h"
 #include "code_801602C.h"
 #include "code_8023868.h"

src/decompress.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "decompress.h"
 
 #define MAGIC_SIR0 0x30524953

src/felicity_bank.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80118A4.h"
 #include "code_80130A8.h"
 #include "common_strings.h"

src/friend_area_action_menu.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "globaldata.h"
 #include "code_80130A8.h"
 #include "code_801B3C0.h"
 #include "code_801BEEC.h"