diff --git a/data/data_8107010.s b/data/data_8107010.s index d379ccb31..47678d6a8 100644 --- a/data/data_8107010.s +++ b/data/data_8107010.s @@ -1,55 +1,88 @@ .section .rodata .string "pksdir0\0" + .string "pksdir0\0" +@ START code_80718D8 + .global gUnknown_8107010 gUnknown_8107010: @ 8107010 .byte 0, 1, 1, 2, 1, 1, 0, 0 .global gUnknown_8107018 gUnknown_8107018: @ 8107018 -@ replacing .incbin "baserom.gba", 0x107018, 0x160 .4byte gUnknown_810702C .4byte gUnknown_8107028 .4byte gUnknown_8107024 + .global gUnknown_8107024 gUnknown_8107024: .byte 0x0a, 0x00, 0x00, 0x00 + .global gUnknown_8107028 gUnknown_8107028: .byte 0x23, 0x57, 0x0a, 0x00 + .global gUnknown_810702C gUnknown_810702C: .byte 0x00, 0x00, 0x00, 0x00 .string "pksdir0\0" + +@ END code_80718D8 + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + +@ START code_807CD9C + .global gUnknown_81070E8 gUnknown_81070E8: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 .byte 0xff, 0xff, 0x01, 0x00, 0x63, 0x00, 0x63, 0x00 + .global gUnknown_8107110 gUnknown_8107110: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 @@ -62,36 +95,52 @@ gUnknown_8107110: .global gUnknown_8107178 gUnknown_8107178: @ 8107178 -@ replacing .incbin "baserom.gba", 0x107178, 0x5C .4byte gUnknown_81070E8 .4byte gUnknown_81070E8 .4byte gUnknown_8107110 .string "pksdir0\0" + +@ END code_807CD9C + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" .global gUnknown_81071D4 gUnknown_81071D4: @ 81071D4 -@ replacing .incbin "baserom.gba", 0x1071D4, 0xC .byte 0x82, 0xe2, 0x82, 0xe6, 0x82, 0xa2, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00 .global gUnknown_81071E0 gUnknown_81071E0: @ 81071E0 -@ replacing .incbin "baserom.gba", 0x1071E0, 0x44 .byte 0x82, 0xdd, 0x82, 0xb3, 0x82, 0xab, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00 .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + +@ START code_808417C #1 + .byte 0x70, 0x6b, 0x73, 0x64 .byte 0x69, 0x72, 0x30, 0x00 @@ -101,9 +150,10 @@ gUnknown_8107224: @ 8107224 .byte 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00 .string "pksdir0\0" +@ END code_808417C #1 + .global gUnknown_8107234 gUnknown_8107234: @ 8107234 -@ replacing .incbin "baserom.gba", 0x107234, 0xE0 .byte 0x01, 0x01, 0x00, 0x02, 0x01, 0x03, 0x00, 0x00, 0x02, 0x04, 0x02, 0x05, 0x03, 0x06, 0x00, 0x00 .byte 0x03, 0x07, 0x04, 0x08, 0x05, 0x09, 0x00, 0x00, 0x04, 0x0a, 0x06, 0x0b, 0x07, 0x0c, 0x00, 0x00 .byte 0x05, 0x0d, 0x08, 0x0e, 0x09, 0x0f, 0x00, 0x00, 0x06, 0x10, 0x0a, 0x11, 0x0a, 0x11, 0x00, 0x00 @@ -121,7 +171,6 @@ gUnknown_8107234: @ 8107234 .global gUnknown_8107314 gUnknown_8107314: @ 8107314 -@ replacing .incbin "baserom.gba", 0x107314, 0x44 .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff .byte 0x02, 0x00, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff .byte 0x04, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff @@ -130,20 +179,18 @@ gUnknown_8107314: @ 8107314 .global gUnknown_8107358 gUnknown_8107358: @ 8107358 -@ replacing .incbin "baserom.gba", 0x107358, 0x1C .byte 0x04, 0x03, 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x04, 0x03, 0x02, 0x03, 0x04, 0x05, 0x06, 0x05 .byte 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00 .global gUnknown_8107374 gUnknown_8107374: @ 8107374 -@ replacing .incbin "baserom.gba", 0x107374, 0xC .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global gUnknown_8107380 gUnknown_8107380: @ 8107380 -@ replacing .incbin "baserom.gba", 0x107380, 0x1C .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .string "pksdir0\0" + .string "pksdir0\0" .global gUnknown_810739C @@ -1327,20 +1374,17 @@ gUnknown_81097C4: @ 81097C4 .global gUnknown_81097C5 gUnknown_81097C5: @ 81097C5 - @ replacing .incbin "baserom.gba", 0x001097c5, 0x1b .byte 0x9f, 0x83, 0xa0, 0x83, 0xa1, 0x83, 0xa2, 0x83, 0xa3, 0x83, 0xa4, 0x83, 0xa5, 0x83, 0xa6, 0x83, 0xa7, 0x83, 0xa8, 0x00, 0x00, 0x00, 0x00, 0xc4, 0x97, 0x10, 0x08 .global gGummiStatBoostLUT gGummiStatBoostLUT: @ 81097E0 - @ replacing .incbin "baserom.gba", 0x001097e0, 0x8 - .2byte 0x0001 - .2byte 0x0002 - .2byte 0x0004 - .2byte 0x0008 + .2byte 1 + .2byte 2 + .2byte 4 + .2byte 8 .global gUnknown_81097E8 gUnknown_81097E8: @ 81097E8 - @ replacing .incbin "baserom.gba", 0x001097e8, 0x10 .byte 0x10, 0x00, 0x00, 0x00 .byte 0x12, 0x00, 0x00, 0x00 .byte 0x14, 0x00, 0x00, 0x00 @@ -1348,12 +1392,11 @@ gUnknown_81097E8: @ 81097E8 .global gUnknown_81097F8 gUnknown_81097F8: @ 81097F8 - @ replacing .incbin "baserom.gba", 0x001097f8, 0x18 .byte 0x11, 0x00, 0x00, 0x00 .byte 0x13, 0x00, 0x00, 0x00 .byte 0x15, 0x00, 0x00, 0x00 .byte 0x17, 0x00, 0x00, 0x00 - .string "pksdir0\0" +.string "pksdir0\0" @ START rescue_team_info.c .global gRescueRankMaxPoints @@ -1374,7 +1417,6 @@ gTeamNamePlaceholder: @ 810982C .global gUnknown_810983C gUnknown_810983C: @ 810983C -@ replacing .incbin "baserom.gba", 0x10983C, 0x68 .4byte gUnknown_8109888 .4byte gUnknown_8109884 .4byte gUnknown_8109880 @@ -1416,10 +1458,13 @@ gUnknown_8109884: gUnknown_8109888: .byte 0x82, 0x4f, 0x00, 0x00 .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" @ START friend_area.c + .global sUnknown_81098A4 sUnknown_81098A4: @ 81098A4 .string "{COLOR_2 UNK_COLOR_4}%s{END_COLOR_TEXT_2}\0" @@ -1430,6 +1475,7 @@ sUnknown_81098AC: @ 81098AC .string "%s#=%c{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0" .align 2,0 .string "pksdir0" + @ END friend_area.c .align 2,0 diff --git a/src/adventure_log.c b/src/adventure_log.c index 38e1917b4..52cc608b4 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -90,7 +90,7 @@ void CleanAdventureLogScreen(void) } } -#ifdef NONMATCHING +#ifdef NONMATCHING // sub_80095E4 memes static void sub_8032084(void) { u32 sVar2; diff --git a/src/code_801C620.c b/src/code_801C620.c index 2e5e3990e..67392c477 100644 --- a/src/code_801C620.c +++ b/src/code_801C620.c @@ -465,7 +465,7 @@ void sub_801C3F8(void) } } -#ifdef NONMATCHING +#ifdef NONMATCHING // sub_80095E4 memes // https://decomp.me/scratch/NdDP3 (98.06% matching) - Seth void sub_801C440(void) { diff --git a/src/code_801D760.c b/src/code_801D760.c index 929a4cf08..7fed66bb1 100644 --- a/src/code_801D760.c +++ b/src/code_801D760.c @@ -594,7 +594,7 @@ void sub_801DB0C(void) } } -NAKED +NAKED // sub_80095E4 memes void sub_801DB54(void) { asm_unified( diff --git a/src/code_801EE10_mid.c b/src/code_801EE10_mid.c index 2451088f1..6334aba44 100644 --- a/src/code_801EE10_mid.c +++ b/src/code_801EE10_mid.c @@ -167,7 +167,7 @@ void sub_801F63C(void) } } -NAKED +NAKED // sub_80095E4 memes void sub_801F690(void) { asm_unified( diff --git a/src/felicity_bank.c b/src/felicity_bank.c index 2221a3e5e..c036abc04 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -55,7 +55,7 @@ u32 CreateFelicityBank(s32 isAsleep) CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PERSIAN); CopyYellowMonsterNametoBuffer(gUnknown_202E1C8, MONSTER_PERSIAN); monName = GetMonSpecies(MONSTER_PERSIAN); - strcpy(gUnknown_202E1C8 - 0x50, monName); + strcpy(gUnknown_202E1C8 - 80, monName); if (gFelicityBankWork->isAsleep == 1) gFelicityBankWork->unkA4 = NULL; diff --git a/src/gulpin_shop_1.c b/src/gulpin_shop_1.c index 295ad51c7..d14710629 100644 --- a/src/gulpin_shop_1.c +++ b/src/gulpin_shop_1.c @@ -109,7 +109,7 @@ bool8 sub_801FB50(bool32 isAsleep) CopyYellowMonsterNametoBuffer(gUnknown_202E5D8,MONSTER_GULPIN); CopyYellowMonsterNametoBuffer(gUnknown_202E1C8,MONSTER_GULPIN); name = GetMonSpecies(MONSTER_GULPIN); - strcpy(gUnknown_202E1C8 - 0x50, name); + strcpy(gUnknown_202E1C8 - 80, name); PrintPokeNameToBuffer(gUnknown_202E1C8 - 0xF0, GetPlayerPokemonStruct()); if (gUnknown_203B27C->isAsleep == 1) { gUnknown_203B27C->unk17C = NULL; diff --git a/src/hints_menu.c b/src/hints_menu.c index dce93d71f..865a48277 100644 --- a/src/hints_menu.c +++ b/src/hints_menu.c @@ -126,7 +126,7 @@ void sub_801E54C(void) } } -NAKED +NAKED // sub_80095E4 memes void sub_801E594(void) { asm_unified( diff --git a/src/makuhita_dojo2.c b/src/makuhita_dojo2.c index 8edf26449..ff3416328 100644 --- a/src/makuhita_dojo2.c +++ b/src/makuhita_dojo2.c @@ -98,7 +98,7 @@ void sub_8030480(void) } } -#ifdef NONMATCHING // https://decomp.me/scratch/lM7lE +#ifdef NONMATCHING // sub_80095E4 memes https://decomp.me/scratch/lM7lE static void sub_80304C8(void) { s16 test; diff --git a/src/menu_input.c b/src/menu_input.c index 460182238..746fa1dfc 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -221,7 +221,7 @@ void sub_8012CAC(UnkTextStruct2 *a0, const MenuItem *a1) sub_8012D08(a0, r7); } -NAKED +NAKED // sub_80095E4 memes void sub_8012D08(UnkTextStruct2 *a0, s32 a1) { asm_unified( diff --git a/src/personality_test.c b/src/personality_test.c index 829923a0f..a76ee3a7c 100644 --- a/src/personality_test.c +++ b/src/personality_test.c @@ -835,7 +835,7 @@ void sub_803CECC(void) } } -#ifdef NONMATCHING +#ifdef NONMATCHING // sub_80095E4 memes void RedrawPartnerSelectionMenu(void) { s32 sVar1; diff --git a/src/pokemon_news.c b/src/pokemon_news.c index a2cbb939e..7655da7da 100644 --- a/src/pokemon_news.c +++ b/src/pokemon_news.c @@ -272,7 +272,7 @@ void sub_802B81C(void) } } -NAKED +NAKED // sub_80095E4 memes void sub_802B880(void) { asm_unified( diff --git a/src/wigglytuff_shop.c b/src/wigglytuff_shop.c index 6e432a9c7..440cdcf7f 100644 --- a/src/wigglytuff_shop.c +++ b/src/wigglytuff_shop.c @@ -227,7 +227,7 @@ void sub_80213A0(void) } } -NAKED +NAKED // sub_80095E4 memes void sub_8021410(void) { asm_unified( diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c index d272a4a52..25d599612 100644 --- a/src/wonder_mail_3_mid.c +++ b/src/wonder_mail_3_mid.c @@ -796,7 +796,7 @@ void sub_802F974(void) } } -NAKED +NAKED // sub_80095E4 memes void sub_802F9C0(void) { asm_unified( diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index f7759654a..c7fa9db21 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -173,7 +173,7 @@ u8 *sub_8030894() return gUnknown_203B320->unk0; } -NAKED +NAKED // sub_80095E4 memes void sub_80308A0(void) { asm_unified(