diff --git a/data/data_8106A4C.s b/data/data_8106A4C.s index 9fd1b62f3..6f4fb6082 100644 --- a/data/data_8106A4C.s +++ b/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 diff --git a/include/globaldata.h b/include/globaldata.h new file mode 100644 index 000000000..7f385c214 --- /dev/null +++ b/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"); \ No newline at end of file diff --git a/ld_script.txt b/ld_script.txt index a1491dd9a..ba014be66 100755 --- a/ld_script.txt +++ b/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); diff --git a/src/adventure_log.c b/src/adventure_log.c index 5cc46126b..ff97dfc24 100644 --- a/src/adventure_log.c +++ b/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" diff --git a/src/charge_move.c b/src/charge_move.c index b765a6a28..279074de5 100644 --- a/src/charge_move.c +++ b/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; diff --git a/src/code_801602C.c b/src/code_801602C.c index 6b70e55e9..85822e4aa 100644 --- a/src/code_801602C.c +++ b/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" diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index 594475d5e..16c743a34 100644 --- a/src/code_801AFA4.c +++ b/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" diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index 74d321c65..f05dcba83 100644 --- a/src/code_801B3C0.c +++ b/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" diff --git a/src/code_801B60C.c b/src/code_801B60C.c index bd1c30c42..3870ba291 100644 --- a/src/code_801B60C.c +++ b/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" diff --git a/src/code_801BEEC.c b/src/code_801BEEC.c index d292a9ae8..6452482a5 100644 --- a/src/code_801BEEC.c +++ b/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" diff --git a/src/code_801C244.c b/src/code_801C244.c index 012555c0a..32f694a72 100644 --- a/src/code_801C244.c +++ b/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" diff --git a/src/code_801C620.c b/src/code_801C620.c index 2bd24e7d2..b45b3c7d5 100644 --- a/src/code_801C620.c +++ b/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" diff --git a/src/code_801C8C4.c b/src/code_801C8C4.c index e385f0f2c..c144dc597 100644 --- a/src/code_801C8C4.c +++ b/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" diff --git a/src/code_801D014.c b/src/code_801D014.c index 47467a646..e21592520 100644 --- a/src/code_801D014.c +++ b/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" diff --git a/src/code_801D9E4.c b/src/code_801D9E4.c index ea72611da..6d891cdbf 100644 --- a/src/code_801D9E4.c +++ b/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" diff --git a/src/code_80227B8.c b/src/code_80227B8.c index ac1e5acff..c40da70a4 100644 --- a/src/code_80227B8.c +++ b/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" diff --git a/src/code_8023144.c b/src/code_8023144.c index 9b4e29504..cd2291d4b 100644 --- a/src/code_8023144.c +++ b/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" diff --git a/src/code_8023868.c b/src/code_8023868.c index bb7468d0f..4e8a88d17 100644 --- a/src/code_8023868.c +++ b/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" diff --git a/src/code_8024458.c b/src/code_8024458.c index 36b0e0f95..fe989c791 100644 --- a/src/code_8024458.c +++ b/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" diff --git a/src/code_802DB28.c b/src/code_802DB28.c index d9c12cfb5..89303a9d5 100644 --- a/src/code_802DB28.c +++ b/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" diff --git a/src/code_802DE84.c b/src/code_802DE84.c index 66faec3ec..e3f476a98 100644 --- a/src/code_802DE84.c +++ b/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" diff --git a/src/code_8031D70.c b/src/code_8031D70.c index de4544ff9..ce33fc6b2 100644 --- a/src/code_8031D70.c +++ b/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" diff --git a/src/code_803C1B4.c b/src/code_803C1B4.c index 9a2c89a9a..acc46a63f 100644 --- a/src/code_803C1B4.c +++ b/src/code_803C1B4.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "dungeon.h" u32 sub_803C1B4(DungeonLocation *dungeon, u8 r1) diff --git a/src/code_803D0D8.c b/src/code_803D0D8.c index 9234514c9..f699ae50c 100644 --- a/src/code_803D0D8.c +++ b/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}; diff --git a/src/common_strings.c b/src/common_strings.c index 344112513..f31059c59 100644 --- a/src/common_strings.c +++ b/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"); diff --git a/src/credits2.c b/src/credits2.c index 903402818..17ebcfb16 100644 --- a/src/credits2.c +++ b/src/credits2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "credits2.h" #include "event_flag.h" #include "input.h" diff --git a/src/data/adventure_log.h b/src/data/adventure_log.h index 036970198..c7a8c49d2 100644 --- a/src/data/adventure_log.h +++ b/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, diff --git a/src/data/code_801602C.h b/src/data/code_801602C.h index 629283012..8e0cd8453 100644 --- a/src/data/code_801602C.h +++ b/src/data/code_801602C.h @@ -1,5 +1,3 @@ -ALIGNED(4) static const u8 sFill[] = _("pksdir0"); - enum { MENU_ACTION_DEFAULT = 1, diff --git a/src/data/code_801AFA4.h b/src/data/code_801AFA4.h index 26ba514ab..9ca462aa5 100644 --- a/src/data/code_801AFA4.h +++ b/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. "); \ No newline at end of file diff --git a/src/data/code_801B3C0.h b/src/data/code_801B3C0.h index 33df79e43..153be787f 100644 --- a/src/data/code_801B3C0.h +++ b/src/data/code_801B3C0.h @@ -1,3 +1 @@ -ALIGNED(4) static const u8 sFill[] = _("pksdir0"); - ALIGNED(4) static const u8 sFmtPkmn0[] = _("{ARG_POKEMON_0}"); \ No newline at end of file diff --git a/src/data/code_801B60C.h b/src/data/code_801B60C.h index 5c38c4e73..cfbb439f6 100644 --- a/src/data/code_801B60C.h +++ b/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"); diff --git a/src/data/code_801BEEC.h b/src/data/code_801BEEC.h index 013457906..585bdf665 100644 --- a/src/data/code_801BEEC.h +++ b/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, diff --git a/src/data/code_801C244.h b/src/data/code_801C244.h index 38a258e5e..fd25289f1 100644 --- a/src/data/code_801C244.h +++ b/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, diff --git a/src/data/code_801C620.h b/src/data/code_801C620.h index e7bff4a3f..3cf8c3ba9 100644 --- a/src/data/code_801C620.h +++ b/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}"); \ No newline at end of file diff --git a/src/data/code_801C8C4.h b/src/data/code_801C8C4.h index 477519fc1..b38d32b13 100644 --- a/src/data/code_801C8C4.h +++ b/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, diff --git a/src/data/code_801D014.h b/src/data/code_801D014.h index d189cf115..57f378590 100644 --- a/src/data/code_801D014.h +++ b/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, diff --git a/src/data/code_801D9E4.h b/src/data/code_801D9E4.h index 637948c1f..96f83413f 100644 --- a/src/data/code_801D9E4.h +++ b/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, diff --git a/src/data/code_80227B8.h b/src/data/code_80227B8.h index e62ee24a9..c3fe35287 100644 --- a/src/data/code_80227B8.h +++ b/src/data/code_80227B8.h @@ -1,5 +1,3 @@ -ALIGNED(4) static const u8 sFill[] = _("pksdir0"); - static const MenuItem sUnknown_80DC584[3] = { {"Yes", 2}, diff --git a/src/data/code_8023144.h b/src/data/code_8023144.h index 49276ee82..4f54cb236 100644 --- a/src/data/code_8023144.h +++ b/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, diff --git a/src/data/code_8023868.h b/src/data/code_8023868.h index 0b23b586f..34ff50334 100644 --- a/src/data/code_8023868.h +++ b/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, diff --git a/src/data/code_8024458.h b/src/data/code_8024458.h index 0686a44a6..87bb678fa 100644 --- a/src/data/code_8024458.h +++ b/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, diff --git a/src/data/code_802DB28.h b/src/data/code_802DB28.h index c3af8c6c2..7b43cf9d3 100644 --- a/src/data/code_802DB28.h +++ b/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, diff --git a/src/data/code_802DE84.h b/src/data/code_802DE84.h index 8c667b1c1..736868b42 100644 --- a/src/data/code_802DE84.h +++ b/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, diff --git a/src/data/code_803D0D8.h b/src/data/code_803D0D8.h index 6926d45d1..25719fad4 100644 --- a/src/data/code_803D0D8.h +++ b/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 }; \ No newline at end of file diff --git a/src/data/credits2.h b/src/data/credits2.h index 1c92393b0..7d8558ec2 100644 --- a/src/data/credits2.h +++ b/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] = { diff --git a/src/data/debug_menu2.h b/src/data/debug_menu2.h index 99eb11fcd..f0e808633 100644 --- a/src/data/debug_menu2.h +++ b/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, diff --git a/src/data/debug_menu3.h b/src/data/debug_menu3.h index fbe3b94dc..8a55acedf 100644 --- a/src/data/debug_menu3.h +++ b/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, diff --git a/src/data/debug_menu4.h b/src/data/debug_menu4.h index f9de94427..c802c5293 100644 --- a/src/data/debug_menu4.h +++ b/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, diff --git a/src/data/decompress.h b/src/data/decompress.h index fd7c602b9..30dadcf53 100644 --- a/src/data/decompress.h +++ b/src/data/decompress.h @@ -1,4 +1 @@ - -ALIGNED(4) static const u8 sFill[] = _("pksdir0"); - static const u32 gByteShiftLookup[4] = {0, 8, 16, 24}; \ No newline at end of file diff --git a/src/data/felicity_bank.h b/src/data/felicity_bank.h index 1f7860457..7e1056981 100644 --- a/src/data/felicity_bank.h +++ b/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, diff --git a/src/data/friend_area_action_menu.h b/src/data/friend_area_action_menu.h index 74ebabdaf..8706913e0 100644 --- a/src/data/friend_area_action_menu.h +++ b/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"; \ No newline at end of file +ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); \ No newline at end of file diff --git a/src/data/friend_list_menu.h b/src/data/friend_list_menu.h index d28adabc7..363270202 100644 --- a/src/data/friend_list_menu.h +++ b/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"; \ No newline at end of file +ALIGNED(4) static const u8 sItemBuffered[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); \ No newline at end of file diff --git a/src/data/gulpin_shop.h b/src/data/gulpin_shop.h index aac130482..4e8df4187 100644 --- a/src/data/gulpin_shop.h +++ b/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, diff --git a/src/data/gulpin_shop_801FB50.h b/src/data/gulpin_shop_801FB50.h index 6ae53cc91..6570573f9 100644 --- a/src/data/gulpin_shop_801FB50.h +++ b/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, diff --git a/src/data/hints_menu1.h b/src/data/hints_menu1.h index 1150dfddf..df74c6d5c 100644 --- a/src/data/hints_menu1.h +++ b/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, diff --git a/src/data/hints_menu2.h b/src/data/hints_menu2.h index 3d0fb16d8..23c79a5fd 100644 --- a/src/data/hints_menu2.h +++ b/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, diff --git a/src/data/kangaskhan_storage1.h b/src/data/kangaskhan_storage1.h index 41cae7738..b8aafcf99 100644 --- a/src/data/kangaskhan_storage1.h +++ b/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, diff --git a/src/data/kangaskhan_storage2.h b/src/data/kangaskhan_storage2.h index 6a0114c57..2ea9e895d 100644 --- a/src/data/kangaskhan_storage2.h +++ b/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, diff --git a/src/data/kecleon_bros1.h b/src/data/kecleon_bros1.h index f86fee175..fa762ce11 100644 --- a/src/data/kecleon_bros1.h +++ b/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, diff --git a/src/data/kecleon_bros2.h b/src/data/kecleon_bros2.h index 7dba00499..1265c2f4b 100644 --- a/src/data/kecleon_bros2.h +++ b/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, diff --git a/src/data/kecleon_bros3.h b/src/data/kecleon_bros3.h index a08d462ef..6e5f32ca0 100644 --- a/src/data/kecleon_bros3.h +++ b/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, diff --git a/src/data/kecleon_bros4.h b/src/data/kecleon_bros4.h index 6d94f94e6..2338493fd 100644 --- a/src/data/kecleon_bros4.h +++ b/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, diff --git a/src/data/luminous_cave.h b/src/data/luminous_cave.h index ef06964eb..237136305 100644 --- a/src/data/luminous_cave.h +++ b/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"); \ No newline at end of file +// TODO: This for a file after which had no data +ALIGNED(4) static const u8 sFill1[] = _("pksdir0"); \ No newline at end of file diff --git a/src/data/main_menu1.h b/src/data/main_menu1.h index 4b36df5c7..44dd27688 100644 --- a/src/data/main_menu1.h +++ b/src/data/main_menu1.h @@ -1,5 +1,3 @@ -static const u8 sFill[] = "pksdir0"; - static const UnkTextStruct2 sUnknown_80E59A8 = { 0, 0, 0, 0, 3, diff --git a/src/data/main_menu2.h b/src/data/main_menu2.h index 710f7c54b..83a8d2ddd 100644 --- a/src/data/main_menu2.h +++ b/src/data/main_menu2.h @@ -1,5 +1,3 @@ -static const u8 sFill[] = "pksdir0"; - static const UnkTextStruct2 sUnknown_80E59C8 = { 0, 0, 0, 0, 3, diff --git a/src/data/makuhita_dojo1.h b/src/data/makuhita_dojo1.h index f8f9ca7d2..f2b10cc53 100644 --- a/src/data/makuhita_dojo1.h +++ b/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"); \ No newline at end of file + +ALIGNED(4) static const u8 sGoTrain[] = _("Go Train"); \ No newline at end of file diff --git a/src/data/makuhita_dojo2.h b/src/data/makuhita_dojo2.h index 891530439..80f12b767 100644 --- a/src/data/makuhita_dojo2.h +++ b/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"); \ No newline at end of file +ALIGNED(4) static const u8 sFmtColor[] = _("{COLOR_2}%c%s{END_COLOR_TEXT_2}"); \ No newline at end of file diff --git a/src/data/options_menu1.h b/src/data/options_menu1.h index 3e3e461ad..ade15c98d 100644 --- a/src/data/options_menu1.h +++ b/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, diff --git a/src/data/options_menu2.h b/src/data/options_menu2.h index cd386040c..5d02cdb71 100644 --- a/src/data/options_menu2.h +++ b/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, diff --git a/src/data/other_menus1.h b/src/data/other_menus1.h index 99cae4f1d..95714d76b 100644 --- a/src/data/other_menus1.h +++ b/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, diff --git a/src/data/other_menus2.h b/src/data/other_menus2.h index 3dd91762d..a57e02e7c 100644 --- a/src/data/other_menus2.h +++ b/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"; \ No newline at end of file +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"); \ No newline at end of file diff --git a/src/data/party_list_menu.h b/src/data/party_list_menu.h index 686584a63..2225a2a11 100644 --- a/src/data/party_list_menu.h +++ b/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"; \ No newline at end of file +ALIGNED(4) static const u8 sUnknown_80DD6E0[] = "%s"; \ No newline at end of file diff --git a/src/data/pokemon_mail.h b/src/data/pokemon_mail.h index 38b711cf2..df4202625 100644 --- a/src/data/pokemon_mail.h +++ b/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!"; \ No newline at end of file diff --git a/src/data/pokemon_news1.h b/src/data/pokemon_news1.h index 6b0a78a77..7e1c374be 100644 --- a/src/data/pokemon_news1.h +++ b/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, diff --git a/src/data/pokemon_news2.h b/src/data/pokemon_news2.h index 14531203a..8d113803f 100644 --- a/src/data/pokemon_news2.h +++ b/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, diff --git a/src/data/pokemon_news3.h b/src/data/pokemon_news3.h index 037ceff99..9025cce23 100644 --- a/src/data/pokemon_news3.h +++ b/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, diff --git a/src/data/post_office_guide1.h b/src/data/post_office_guide1.h index 0db013b7f..bdc69da7f 100644 --- a/src/data/post_office_guide1.h +++ b/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"); \ No newline at end of file + "mail at the {COLOR_1 LIGHT_BLUE}left counter{END_COLOR_TEXT_1} over there."); \ No newline at end of file diff --git a/src/data/post_office_guide2.h b/src/data/post_office_guide2.h index 18eddb061..23a3d32e5 100644 --- a/src/data/post_office_guide2.h +++ b/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"; \ No newline at end of file +ALIGNED(4) static const u8 sRedQuestionMarks[] = _("{COLOR_1 RED_2}???{END_COLOR_TEXT_1}"); \ No newline at end of file diff --git a/src/data/quick_save_read.h b/src/data/quick_save_read.h index 83bf84e6a..4ea679523 100644 --- a/src/data/quick_save_read.h +++ b/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" diff --git a/src/data/quick_save_write.h b/src/data/quick_save_write.h index 9e6ce1dd7..2e52fe03f 100644 --- a/src/data/quick_save_write.h +++ b/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."); \ No newline at end of file +ALIGNED(4) static const u8 sSaveFailed[] = _("{CENTER_ALIGN}Save failed."); \ No newline at end of file diff --git a/src/data/save_read.h b/src/data/save_read.h index ed1f4604a..645847562 100644 --- a/src/data/save_read.h +++ b/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."); \ No newline at end of file diff --git a/src/data/save_write.h b/src/data/save_write.h index 438c3042c..e81d79ba1 100644 --- a/src/data/save_write.h +++ b/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."); diff --git a/src/data/thank_you_wonder_mail.h b/src/data/thank_you_wonder_mail.h index 16004ae6b..8071f3fcf 100644 --- a/src/data/thank_you_wonder_mail.h +++ b/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}?"); \ No newline at end of file diff --git a/src/data/trade_items_menu.h b/src/data/trade_items_menu.h index bd6fe0e13..ff7010996 100644 --- a/src/data/trade_items_menu.h +++ b/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}, diff --git a/src/data/wigglytuff_shop1.h b/src/data/wigglytuff_shop1.h index baa530295..7a1f6663a 100644 --- a/src/data/wigglytuff_shop1.h +++ b/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, diff --git a/src/data/wigglytuff_shop2.h b/src/data/wigglytuff_shop2.h index c686529ac..dadbeaaeb 100644 --- a/src/data/wigglytuff_shop2.h +++ b/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, diff --git a/src/data/wigglytuff_shop3.h b/src/data/wigglytuff_shop3.h index be6359c7c..39ad2944c 100644 --- a/src/data/wigglytuff_shop3.h +++ b/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, diff --git a/src/data/wonder_mail_1.h b/src/data/wonder_mail_1.h index 330de9ca0..e5d9dd688 100644 --- a/src/data/wonder_mail_1.h +++ b/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."); \ No newline at end of file diff --git a/src/data/wonder_mail_802C10C.h b/src/data/wonder_mail_802C10C.h index df90236a3..7aa4081fa 100644 --- a/src/data/wonder_mail_802C10C.h +++ b/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, diff --git a/src/data/wonder_mail_802C4C8.h b/src/data/wonder_mail_802C4C8.h index 0103d14ae..0f34b3b24 100644 --- a/src/data/wonder_mail_802C4C8.h +++ b/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, diff --git a/src/data/wonder_mail_802C860.h b/src/data/wonder_mail_802C860.h index 4a5873273..4b8e71810 100644 --- a/src/data/wonder_mail_802C860.h +++ b/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, diff --git a/src/data/wonder_mail_802CDD4.h b/src/data/wonder_mail_802CDD4.h index 9868d43e2..7c1f58c7b 100644 --- a/src/data/wonder_mail_802CDD4.h +++ b/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, diff --git a/src/data/wonder_mail_802D098.h b/src/data/wonder_mail_802D098.h index 1bfdf8e1f..f7ccd9f76 100644 --- a/src/data/wonder_mail_802D098.h +++ b/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, diff --git a/src/data/wonder_mail_main_menu.h b/src/data/wonder_mail_main_menu.h index 51ee17c5a..5cf3e723c 100644 --- a/src/data/wonder_mail_main_menu.h +++ b/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"; \ No newline at end of file diff --git a/src/debug_menu2.c b/src/debug_menu2.c index aa603300d..f629bc9cb 100644 --- a/src/debug_menu2.c +++ b/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" diff --git a/src/debug_menu3.c b/src/debug_menu3.c index cffd9d6a1..0acc28ab0 100644 --- a/src/debug_menu3.c +++ b/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" diff --git a/src/debug_menu4.c b/src/debug_menu4.c index 561d66c3f..b9c2138ff 100644 --- a/src/debug_menu4.c +++ b/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" diff --git a/src/decompress.c b/src/decompress.c index 2eda26f8f..79c046ec0 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "decompress.h" #define MAGIC_SIR0 0x30524953 diff --git a/src/felicity_bank.c b/src/felicity_bank.c index bcfd661c6..c368359fa 100644 --- a/src/felicity_bank.c +++ b/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" diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index ded576cdf..00de20d80 100644 --- a/src/friend_area_action_menu.c +++ b/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" diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index 9462cd37d..0f64938ed 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_801602C.h" diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index 91ea240cd..40d6f5724 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_801EE10.h" #include "code_801EE10_mid.h" diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index d8489dfa3..f3bf8a0a5 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_801BEEC.h" diff --git a/src/hints_menu1.c b/src/hints_menu1.c index 5153fa48e..2f6e13d0e 100644 --- a/src/hints_menu1.c +++ b/src/hints_menu1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "common_strings.h" #include "hints_menu1.h" diff --git a/src/hints_menu2.c b/src/hints_menu2.c index 7eb2e151f..c87a1172e 100644 --- a/src/hints_menu2.c +++ b/src/hints_menu2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "common_strings.h" #include "hints_menu2.h" diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c index 84173b1f5..35c3f0e17 100644 --- a/src/kangaskhan_storage1.c +++ b/src/kangaskhan_storage1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "code_801B3C0.h" #include "code_801C8C4.h" diff --git a/src/kangaskhan_storage2.c b/src/kangaskhan_storage2.c index a97164d0a..0b8440ea9 100644 --- a/src/kangaskhan_storage2.c +++ b/src/kangaskhan_storage2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "code_801B3C0.h" #include "code_801C8C4.h" diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index 970edcd2c..b2f29c428 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_801B3C0.h" diff --git a/src/kecleon_bros2.c b/src/kecleon_bros2.c index 5d54bebc5..707beedc0 100644 --- a/src/kecleon_bros2.c +++ b/src/kecleon_bros2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "constants/input.h" diff --git a/src/kecleon_bros3.c b/src/kecleon_bros3.c index e4eb0c16c..9d7d8eb2e 100644 --- a/src/kecleon_bros3.c +++ b/src/kecleon_bros3.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "constants/input.h" diff --git a/src/kecleon_bros4.c b/src/kecleon_bros4.c index a2580dc87..97ebf7af0 100644 --- a/src/kecleon_bros4.c +++ b/src/kecleon_bros4.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "code_80130A8.h" diff --git a/src/load_screen.c b/src/load_screen.c index 6f714b1c1..96240de2b 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "bg_palette_buffer.h" #include "code_800D090.h" #include "code_80130A8.h" @@ -148,7 +149,6 @@ ALIGNED(4) const char gNumAdventurePlaceholder[] = "%d"; ALIGNED(4) const char gHelperInfoPlaceholder[] = "%s (%s)"; ALIGNED(4) const char gNoHelperText[] = "-----"; ALIGNED(4) const char gClmkpatFileName[] = "clmkpat"; // clmkpat -ALIGNED(4) const char load_screen_fill[] = "pksdir0"; void CreateLoadScreen(u32 currMenu) { @@ -411,3 +411,8 @@ bool8 IsQuickSave(void) isQuicksave = TRUE; return isQuicksave; } + +bool8 sub_8039880(void) +{ + return (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0 || sub_8011C1C() == 2); +} \ No newline at end of file diff --git a/src/luminous_cave.c b/src/luminous_cave.c index f50a9d827..2d1efaf56 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_80130A8.h" diff --git a/src/mailbox.c b/src/mailbox.c index 7a863ba1d..37d1029f6 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_802DE84.h" #include "common_strings.h" #include "memory.h" @@ -21,8 +22,6 @@ EWRAM_DATA_2 struct unkStruct_203B304 *gUnknown_203B304 = {0}; -static const u8 wonder_mail_802DF88_fill1[] = "pksdir0"; - const UnkTextStruct2 gUnknown_80E0284 = { 0x00, 0x00, 0x00, 0x00, @@ -70,7 +69,6 @@ const u8 gMailActionStore[] = "Store"; const u8 gMailActionRead[] = "Read"; const u8 gMailAccepted[] = "Accepted"; const u8 gUnknown_80E0324[] = "/"; -static const u8 mailbox_fill[] = "pksdir0"; void sub_802E578(void); void HandleMailActionMenu(void); diff --git a/src/main_menu1.c b/src/main_menu1.c index f47134f02..68b02dd34 100644 --- a/src/main_menu1.c +++ b/src/main_menu1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "adventure_log_menu.h" #include "code_8098BDC.h" #include "constants/item.h" diff --git a/src/main_menu2.c b/src/main_menu2.c index 2bc001b7a..0baa02aa1 100644 --- a/src/main_menu2.c +++ b/src/main_menu2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_803D0D8.h" #include "constants/main_menu.h" #include "constants/wonder_mail.h" diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index d6990e08e..715711d70 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_801B60C.h" diff --git a/src/makuhita_dojo2.c b/src/makuhita_dojo2.c index 5ed76f593..27564c5f8 100644 --- a/src/makuhita_dojo2.c +++ b/src/makuhita_dojo2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "code_80972F4.h" diff --git a/src/menu_input.c b/src/menu_input.c index 45152b9f8..89713e9a6 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800558C.h" #include "code_800D090.h" #include "code_80118A4.h" @@ -25,7 +26,6 @@ static void sub_801332C(s16 *); static void sub_8013470(MenuInputStruct *); static bool8 sub_8013DD0(unkStructFor8013AA0 *); -ALIGNED(4) static const char fill_save7[] = _("pksdir0"); const u32 gDefaultMenuTextColors[3] = { COLOR_WHITE_2, COLOR_RED, COLOR_RED }; u32 sub_8012A64(MenuInputStructSub *r0, s32 r1) diff --git a/src/options_menu1.c b/src/options_menu1.c index d10f9cc9a..6caf7f12a 100644 --- a/src/options_menu1.c +++ b/src/options_menu1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "code_8098BDC.h" #include "common_strings.h" diff --git a/src/options_menu2.c b/src/options_menu2.c index b48dea6a8..6e151e31f 100644 --- a/src/options_menu2.c +++ b/src/options_menu2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "constants/colors.h" #include "constants/input.h" diff --git a/src/other_menus1.c b/src/other_menus1.c index 225fbf54d..5d0940a26 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "bg_palette_buffer.h" #include "code_800558C.h" #include "code_8009804.h" diff --git a/src/other_menus2.c b/src/other_menus2.c index 8fc98d5fe..682631fc9 100644 --- a/src/other_menus2.c +++ b/src/other_menus2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_8094F88.h" #include "constants/communication_error_codes.h" #include "constants/dungeon.h" diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 56c44f7f3..7497d475c 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "code_80130A8.h" diff --git a/src/pelipper_board.c b/src/pelipper_board.c index b9d90c1a1..cd0f11967 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_802DE84.h" #include "mailbox.h" #include "pokemon.h" @@ -65,7 +66,6 @@ const u8 gPelipperBoard_BulletinBoard[] = "Bulletin Board"; const u8 gPelipperBoard_JobList[] = "Job List"; const u8 gPelipperBoard_Accepted[] = "Accepted"; const u8 gPelipperStatusSlash[] = "/"; -static const u8 sPelipperfill[] = "pksdir0"; extern void sub_802ECB4(void); extern void nullsub_134(void); diff --git a/src/personality_test.c b/src/personality_test.c index f08287de8..bf4b128e6 100644 --- a/src/personality_test.c +++ b/src/personality_test.c @@ -336,7 +336,14 @@ const UnkTextStruct2 gUnknown_80F4244 = NULL }; -const char filler[] = "pksdir0"; // CHUNSOFT inserted for aligning data + + + +// FILE 2: + + + +const char filler[] = "pksdir0"; const s16 gPartners[NUM_PARTNERS] = { @@ -813,6 +820,18 @@ void sub_803CE6C() sub_803CECC(); // Free 203B404 } + + + + + + +// THIS IS A NEW FILE: + + + + + void sub_803CEAC(void) { gUnknown_203B404 = MemoryAlloc(sizeof(struct PersonalityStruct_203B404), 8); diff --git a/src/pokemon_news1.c b/src/pokemon_news1.c index 224bca31e..ba266bb36 100644 --- a/src/pokemon_news1.c +++ b/src/pokemon_news1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_803B050.h" diff --git a/src/pokemon_news2.c b/src/pokemon_news2.c index caf043373..be189360d 100644 --- a/src/pokemon_news2.c +++ b/src/pokemon_news2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "game_options.h" diff --git a/src/pokemon_news3.c b/src/pokemon_news3.c index 0014a464d..3da672b0f 100644 --- a/src/pokemon_news3.c +++ b/src/pokemon_news3.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "code_803B050.h" diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index c7c24fba5..7dbd9abf5 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "input.h" #include "memory.h" diff --git a/src/post_office_guide2.c b/src/post_office_guide2.c index 490d1a23a..7a32401ea 100644 --- a/src/post_office_guide2.c +++ b/src/post_office_guide2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "code_803B050.h" diff --git a/src/quick_save_read.c b/src/quick_save_read.c index 39c0a4fd1..01c805493 100644 --- a/src/quick_save_read.c +++ b/src/quick_save_read.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "memory.h" #include "quick_save_read.h" diff --git a/src/quick_save_write.c b/src/quick_save_write.c index a429cb3ed..3e1535ac8 100644 --- a/src/quick_save_write.c +++ b/src/quick_save_write.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "memory.h" #include "quick_save_write.h" @@ -17,9 +18,9 @@ void PrepareQuickSaveWrite(u8 *r0, u32 r1, u8 r2) sQuickSaveWrite->state = 0; if (sQuickSaveWrite->unkC != 0) - sub_80141B4(gUnknown_80D45AC, 0, 0, 0x20); + sub_80141B4(sUnknown_80D45AC, 0, 0, 0x20); else - sub_80141B4(gUnknown_80D45AC, 0, 0, 0x20); + sub_80141B4(sUnknown_80D45AC, 0, 0, 0x20); } u32 WriteQuickSave(void) @@ -48,19 +49,19 @@ u32 WriteQuickSave(void) sub_80121E0(987655); if (sQuickSaveWrite->unkC != 0) - sub_80141B4(gUnknown_80D45F4, 0, 0, 0x301); + sub_80141B4(sUnknown_80D45F4, 0, 0, 0x301); else - sub_80141B4(gUnknown_80D4668, 0, 0, 0x301); + sub_80141B4(sUnknown_80D4668, 0, 0, 0x301); sQuickSaveWrite->state = 3; break; case SAVE_NOT_WRTTEN: - sub_80141B4(gSaveNotWritten2, 0, 0, 0); + sub_80141B4(sSaveNotWritten, 0, 0, 0); sQuickSaveWrite->state = 4; break; default: sub_80121E0(987657); - sub_80141B4(gSaveFailed2, 0, 0, 0x301); + sub_80141B4(sSaveFailed, 0, 0, 0x301); sQuickSaveWrite->state = 3; break; } diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index fec4c24d8..1ca574b68 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "code_8094F88.h" #include "constants/main_menu.h" @@ -240,8 +241,6 @@ const MenuItem gUnknown_80E75A0[4] = { ALIGNED(4) const u8 sUnknown_80E75C0[] = _("{CENTER_ALIGN}new mail."); ALIGNED(4) const u8 sUnknown_80E75CC[] = _("{CENTER_ALIGN}There is no space for receiving"); -static const u8 fill0[] = "pksdir0"; - extern void sub_8031D70(u32, u32); extern void sub_8031E10(void); extern u32 sub_8031DCC(void); diff --git a/src/save_menu.c b/src/save_menu.c index e1faf246e..3df2b042e 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -114,8 +114,6 @@ ALIGNED(4) const u8 gUnknown_80E7178[] = _("{CENTER_ALIGN}The data could not be "{CENTER_ALIGN}Please turn off the power and remove\n" "{CENTER_ALIGN}and reinsert the DS Card."); -ALIGNED(4) static const u8 save_menu_fill0[] = "pksdir0"; - extern void sub_8038440(); extern void sub_80384D0(); extern void sub_8038830(); diff --git a/src/save_read.c b/src/save_read.c index a5f1a8111..3f37afdb3 100644 --- a/src/save_read.c +++ b/src/save_read.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "memory.h" #include "save.h" diff --git a/src/save_write.c b/src/save_write.c index aa27ce6f4..cc8fd70b0 100644 --- a/src/save_write.c +++ b/src/save_write.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "code_8098BDC.h" #include "memory.h" diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 229ac4155..a4455fcc9 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "code_80130A8.h" diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index 7d9912766..0313994ed 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_801B3C0.h" diff --git a/src/wigglytuff_shop1.c b/src/wigglytuff_shop1.c index ebbb358bc..daebb1f83 100644 --- a/src/wigglytuff_shop1.c +++ b/src/wigglytuff_shop1.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "constants/input.h" diff --git a/src/wigglytuff_shop2.c b/src/wigglytuff_shop2.c index fd1750b75..0325869fb 100644 --- a/src/wigglytuff_shop2.c +++ b/src/wigglytuff_shop2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" #include "common_strings.h" diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index 119b16952..089075c9c 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_8023144.h" diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 8d42c5252..bf0cfcd91 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_8023868.h" @@ -170,102 +171,6 @@ enum FriendRescueStates DEFAULT_FALLBACK_STATE = 61 }; -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"); - #include "data/wonder_mail_1.h" diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 85a4f6c38..9c35b2f80 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_800D090.h" #include "code_80130A8.h" #include "code_802F204.h" diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c index a9253656c..657b89c58 100644 --- a/src/wonder_mail_3_mid.c +++ b/src/wonder_mail_3_mid.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_802DE84.h" #include "code_802F204.h" #include "constants/input.h" @@ -232,7 +233,6 @@ const UnkTextStruct2 gUnknown_80E072C = { ALIGNED(4) const u8 gUnknown_80E0744[] = "Dungeons"; ALIGNED(4) const u8 gUnknown_80E0750[] = {0x83, 0xC2}; ALIGNED(4) const u8 gUnknown_80E0754[] = {0x83, 0xC0}; -ALIGNED(4) static const u8 sFill1[] = "pksdir0"; u32 sub_802EF48(void) { diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index f0acccb29..6fe5af693 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -1,5 +1,6 @@ -#include "constants/input.h" #include "global.h" +#include "globaldata.h" +#include "constants/input.h" #include "text1.h" #include "text2.h" #include "memory.h" @@ -75,7 +76,6 @@ ALIGNED(4) const u8 ToDoList[] = "To-Do List"; ALIGNED(4) const u8 SOSMail[] = "SOS Mail"; ALIGNED(4) const u8 RequestList[] = "Request List"; ALIGNED(4) const u8 SOSList[] = "SOS List"; -static const u8 wonder_mail_fill[] = "pksdir0"; extern bool8 HasNoWonderMailType(u32); extern s32 sub_8030A74(void); diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index 337c35bb8..b4b204f46 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "constants/wonder_mail.h" #include "memory.h" #include "text1.h" @@ -48,7 +49,6 @@ const UnkTextStruct2 gUnknown_80E091C = { const u8 gUnknown_80E0934[] = "ID:"; const u8 gUnknown_80E0938[] = "%-4d"; -static const u8 wonder_mail_fill[] = "pksdir0"; extern void sub_8030DD4(void); extern void CreateRescueDescription(unkStruct_802C39C *); diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index b82d8e7af..a23a3e62e 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "input.h" #include "memory.h" #include "text1.h" @@ -77,7 +78,6 @@ ALIGNED(4) const u8 gUnknown_80E09D8[] = _( ALIGNED(4) const u8 gUnknown_80E0A0C[] = _( " ...Uh{COMMA} no?\n" "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE}A-OK Mail{END_COLOR_TEXT_1}."); -const u8 wonder_mail_6_fill[] = "pksdir0"; extern void sub_80306A8(s32, u32, u32, u32); extern void sub_8031300(void); diff --git a/src/wonder_mail_802C10C.c b/src/wonder_mail_802C10C.c index 81b4534b6..fd8e11a59 100644 --- a/src/wonder_mail_802C10C.c +++ b/src/wonder_mail_802C10C.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_803B050.h" #include "code_80958E8_1.h" diff --git a/src/wonder_mail_802C4C8.c b/src/wonder_mail_802C4C8.c index 3f3c9178a..66aad1d6c 100644 --- a/src/wonder_mail_802C4C8.c +++ b/src/wonder_mail_802C4C8.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_803B050.h" #include "code_80958E8_1.h" diff --git a/src/wonder_mail_802C860.c b/src/wonder_mail_802C860.c index 95c69b0ae..ac732cb28 100644 --- a/src/wonder_mail_802C860.c +++ b/src/wonder_mail_802C860.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_803B050.h" #include "code_802DE84.h" diff --git a/src/wonder_mail_802CDD4.c b/src/wonder_mail_802CDD4.c index b3bda2362..a8c42da0c 100644 --- a/src/wonder_mail_802CDD4.c +++ b/src/wonder_mail_802CDD4.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_803B050.h" #include "constants/input.h" diff --git a/src/wonder_mail_802D098.c b/src/wonder_mail_802D098.c index 9c74965b0..3efa8a008 100644 --- a/src/wonder_mail_802D098.c +++ b/src/wonder_mail_802D098.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80130A8.h" #include "code_802DE84.h" #include "code_803B050.h" diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 14bee125e..31f809d34 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "code_80118A4.h" #include "code_80130A8.h" #include "code_801B3C0.h" @@ -35,60 +36,11 @@ #define PASSWORD_INVALID 19 #define PASSWORD_ENTRY_SCREEN 18 -extern const char Cancel_80E7D24[]; -extern const char Yes_80E7D2C[]; - -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} -}; - - -#include "data/wonder_mail_main_menu.h" - -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"; - -ALIGNED(4) const char wonder_mail_main_fill1[] = "pksdir0"; - +// size: 0x49C struct unkStruct_203B3E8 { - // size: 0x49C - u8 state; // state variable? - u8 PasswordEntryBuffer[PASSWORD_BUFFER_SIZE]; // Wonder Mail Buffer... + /* 0x0 */ u8 state; + /* 0x1 */ u8 PasswordEntryBuffer[PASSWORD_BUFFER_SIZE]; // Wonder Mail Buffer... union UNK38 { WonderMail decodedMail; // 0x14 @@ -97,26 +49,24 @@ struct unkStruct_203B3E8 u8 fill68[0x1EC - 0x68]; UnkTextStruct2 unk1EC[4]; u32 unk24C; - u32 wonderMailStatus; - + /* 0x250 */ u32 wonderMailStatus; unkStruct_803B344 unk254; - unkStruct_803B344 unk308; u8 unk3BC; u8 fill3BD[0x3C0 - 0x3BD]; - unkStruct_803B344 unk3C0; - WonderMail unk474; u8 **unk488; u8 *unk48C; - s32 wonderMailMethod; - u32 wonderMailMode; - bool8 wonderMailAccepted; + /* 0x490 */ s32 wonderMailMethod; + /* 0x494 */ u32 wonderMailMode; + /* 0x498 */ bool8 wonderMailAccepted; }; EWRAM_DATA_2 struct unkStruct_203B3E8 *gUnknown_203B3E8 = {0}; +#include "data/wonder_mail_main_menu.h" + extern void SetWonderMailMainMenuState(u8); extern void sub_8030DE4(void); extern void sub_803084C(void); @@ -146,12 +96,6 @@ void AdvanceToPasswordEntryScreen(void); void HandlePasswordEntryScreen(void); void HandleInvalidPasswordMenu(void); - -bool8 sub_8039880(void) -{ - return (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0 || sub_8011C1C() == 2); -} - bool8 CreateWonderMailMenu(void) { s32 index;