diff --git a/heartgoldus.xMAP b/heartgoldus.xMAP index f7f0e47c14..d0e46a692a 100644 --- a/heartgoldus.xMAP +++ b/heartgoldus.xMAP @@ -3623,9 +3623,8 @@ 63](sub_0202F1F4,func) found in global save_pokegear.o 62](ScrCmd_811,func) found in global scrcmd_pokemon_misc.o 62](ScrCmd_810,func) found in global scrcmd_c.o - 62](ScrCmd_809,func) found in global overlay_25.o - 63](ov01_021EF348,func) found in global scrcmd_message.o - 63](.rodata,section) found in local overlay_25.o + 62](ScrCmd_ShowTrainerHouseIntroMessage,func) found in global overlay_25.o + 63](Save_TrainerHouse_Get,func) found in global save_trainer_house.o 63](ov01_021EF564,func) found in global scrcmd_message.o 64](ovFieldMain_GetMsgBoxParameters,func) found in local scrcmd_message.o 64](ovFieldMain_CreateMessageBox,func) found in local scrcmd_message.o @@ -3633,9 +3632,8 @@ 64](ovFieldMain_GetTextFrameDelay,func) found in local scrcmd_message.o 64](ov01_021EF758,func) found in local scrcmd_message.o 64](ovFieldMain_AddTextPrinterParameterized,func) found in local scrcmd_message.o - 63](Save_TrainerHouse_Get,func) found in global save_trainer_house.o - 63](CallTask_020509F0,func) found in global encounter.o - 64](Task_020509F0,func) found in local encounter.o + 63](TrainerHouse_DefaultIntroMessage,object) found in local overlay_25.o + 63](ov01_021EF348,func) found in global scrcmd_message.o 62](ScrCmd_SetTrainerHouseSprite,func) found in global unk_0206D494.o 63](TrainerHouseSet_CheckHasData,func) found in global save_trainer_house.o 62](ScrCmd_806,func) found in global scrcmd_c.o @@ -5719,6 +5717,14 @@ 48](FieldSystem_SetFollowerPokeParam,func) found in global field_follow_poke.o 48](FieldSystemUnkSub108_Set,func) found in global field_follow_poke.o 47](GF_GetNumPendingVramTransferTasks,func) found in global vram_transfer_manager.o + 47](TrainerHouse_StartBattle,func) found in global overlay_25.o + 48](TrainerHouse_SetNames,func) found in local overlay_25.o + 48](TrainerHouse_NewBattleSetup,func) found in local overlay_25.o + 49](TrainerHouse_InitBattleSetup,func) found in local overlay_25.o + 50](TrainerHouse_InitTrainer,func) found in local overlay_25.o + 50](TrainerHouse_CopyToPokemon,func) found in local overlay_25.o + 48](CallTask_020509F0,func) found in global encounter.o + 49](Task_020509F0,func) found in local encounter.o 46](sub_0205F1AC,func) found in global field_map_object.o 46](MapObject_SetFlag28,func) found in global field_map_object.o 46](MapObject_SetFlag24,func) found in global field_map_object.o @@ -111874,111 +111880,30 @@ #>00000019 SDK_OVERLAY.OVY_25.ID (linker command file) #>022598C0 SDK_OVERLAY.OVY_25.START (linker command file) #>022598C0 SDK_OVERLAY.OVY_25.TEXT_START (linker command file) - 022598C0 00000088 .text ov25_022598C0 (overlay_25.o) - 022598C0 000004C4 .text .text (overlay_25.o) 022598C0 00000000 .text $t (overlay_25.o) - 022598CA 00000000 .text $b (overlay_25.o) - 022598D6 00000000 .text $b (overlay_25.o) - 022598DE 00000000 .text $b (overlay_25.o) - 022598EE 00000000 .text $b (overlay_25.o) - 022598F8 00000000 .text $b (overlay_25.o) - 02259908 00000000 .text $b (overlay_25.o) - 02259918 00000000 .text $b (overlay_25.o) - 02259920 00000000 .text $b (overlay_25.o) - 0225992A 00000000 .text $b (overlay_25.o) - 02259938 00000000 .text $b (overlay_25.o) + 022598C0 00000088 .text TrainerHouse_StartBattle (overlay_25.o) 02259940 00000000 .text $d (overlay_25.o) 02259948 00000000 .text $t (overlay_25.o) - 02259948 000000E8 .text ov25_02259948 (overlay_25.o) - 02259954 00000000 .text $b (overlay_25.o) - 02259960 00000000 .text $b (overlay_25.o) - 02259968 00000000 .text $b (overlay_25.o) - 02259974 00000000 .text $b (overlay_25.o) - 0225997C 00000000 .text $b (overlay_25.o) - 02259984 00000000 .text $b (overlay_25.o) - 0225998E 00000000 .text $b (overlay_25.o) - 02259998 00000000 .text $b (overlay_25.o) - 022599AA 00000000 .text $b (overlay_25.o) - 022599B0 00000000 .text $b (overlay_25.o) - 022599BA 00000000 .text $b (overlay_25.o) - 022599C0 00000000 .text $b (overlay_25.o) - 022599D2 00000000 .text $b (overlay_25.o) - 022599DA 00000000 .text $b (overlay_25.o) - 022599E4 00000000 .text $b (overlay_25.o) - 022599EE 00000000 .text $b (overlay_25.o) - 02259A00 00000000 .text $b (overlay_25.o) - 02259A06 00000000 .text $b (overlay_25.o) - 02259A10 00000000 .text $b (overlay_25.o) - 02259A16 00000000 .text $b (overlay_25.o) + 02259948 000000E8 .text TrainerHouse_SetNames (overlay_25.o) 02259A24 00000000 .text $d (overlay_25.o) - 02259A30 0000007C .text ScrCmd_809 (overlay_25.o) 02259A30 00000000 .text $t (overlay_25.o) - 02259A36 00000000 .text $b (overlay_25.o) - 02259A42 00000000 .text $b (overlay_25.o) - 02259A50 00000000 .text $b (overlay_25.o) - 02259A5C 00000000 .text $b (overlay_25.o) - 02259A66 00000000 .text $b (overlay_25.o) - 02259A7A 00000000 .text $b (overlay_25.o) - 02259A92 00000000 .text $b (overlay_25.o) - 02259A9A 00000000 .text $b (overlay_25.o) + 02259A30 0000007C .text ScrCmd_ShowTrainerHouseIntroMessage (overlay_25.o) 02259AA4 00000000 .text $d (overlay_25.o) 02259AAC 00000000 .text $t (overlay_25.o) - 02259AAC 000000E4 .text ov25_02259AAC (overlay_25.o) - 02259AB8 00000000 .text $b (overlay_25.o) - 02259AC2 00000000 .text $b (overlay_25.o) - 02259AE2 00000000 .text $b (overlay_25.o) - 02259AF6 00000000 .text $b (overlay_25.o) - 02259AFE 00000000 .text $b (overlay_25.o) - 02259B08 00000000 .text $b (overlay_25.o) - 02259B16 00000000 .text $b (overlay_25.o) - 02259B1C 00000000 .text $b (overlay_25.o) - 02259B26 00000000 .text $b (overlay_25.o) - 02259B34 00000000 .text $b (overlay_25.o) - 02259B3A 00000000 .text $b (overlay_25.o) - 02259B46 00000000 .text $b (overlay_25.o) - 02259B4C 00000000 .text $b (overlay_25.o) - 02259B56 00000000 .text $b (overlay_25.o) - 02259B62 00000000 .text $b (overlay_25.o) - 02259B68 00000000 .text $b (overlay_25.o) - 02259B72 00000000 .text $b (overlay_25.o) + 02259AAC 000000E4 .text TrainerHouse_NewBattleSetup (overlay_25.o) 02259B8C 00000000 .text $d (overlay_25.o) - 02259B90 00000134 .text ov25_02259B90 (overlay_25.o) 02259B90 00000000 .text $t (overlay_25.o) - 02259B9A 00000000 .text $b (overlay_25.o) - 02259BC2 00000000 .text $b (overlay_25.o) - 02259BD8 00000000 .text $b (overlay_25.o) - 02259BE2 00000000 .text $b (overlay_25.o) - 02259BFE 00000000 .text $b (overlay_25.o) - 02259C1A 00000000 .text $b (overlay_25.o) - 02259C26 00000000 .text $b (overlay_25.o) - 02259C36 00000000 .text $b (overlay_25.o) - 02259C52 00000000 .text $b (overlay_25.o) - 02259C6A 00000000 .text $b (overlay_25.o) - 02259C7C 00000000 .text $b (overlay_25.o) - 02259C88 00000000 .text $b (overlay_25.o) - 02259C90 00000000 .text $b (overlay_25.o) - 02259C9C 00000000 .text $b (overlay_25.o) - 02259CA6 00000000 .text $b (overlay_25.o) - 02259CB2 00000000 .text $b (overlay_25.o) - 02259CB8 00000000 .text $b (overlay_25.o) + 02259B90 00000134 .text TrainerHouse_CopyToPokemon (overlay_25.o) 02259CC0 00000000 .text $d (overlay_25.o) - 02259CC4 00000050 .text ov25_02259CC4 (overlay_25.o) + 02259CC4 0000004E .text TrainerHouse_InitTrainer (overlay_25.o) 02259CC4 00000000 .text $t (overlay_25.o) - 02259CD0 00000000 .text $b (overlay_25.o) - 02259CDA 00000000 .text $b (overlay_25.o) - 02259CF0 00000000 .text $b (overlay_25.o) - 02259CFC 00000000 .text $b (overlay_25.o) - 02259D08 00000000 .text $b (overlay_25.o) - 02259D12 00000000 .text $d (overlay_25.o) - 02259D14 00000070 .text ov25_02259D14 (overlay_25.o) + 02259D14 00000070 .text TrainerHouse_InitBattleSetup (overlay_25.o) 02259D14 00000000 .text $t (overlay_25.o) - 02259D2C 00000000 .text $b (overlay_25.o) - 02259D3E 00000000 .text $b (overlay_25.o) - 02259D4C 00000000 .text $b (overlay_25.o) - 02259D62 00000000 .text $b (overlay_25.o) - 02259D6C 00000000 .text $b (overlay_25.o) - 02259D7C 00000000 .text $b (overlay_25.o) - 02259D84 00000198 .rodata .rodata (overlay_25.o) + 02259D84 00000000 .rodata .rodata (overlay_25.o) + 02259D84 00000008 .rodata TrainerHouse_DefaultIntroMessage (overlay_25.o) + 02259D8C 00000008 .rodata TrainerHouse_DefaultWinMessage (overlay_25.o) + 02259D94 00000008 .rodata TrainerHouse_DefaultLoseMessage (overlay_25.o) + 02259D9C 00000180 .rodata ov25_02259D9C (overlay_25.o) #>02259F1C SDK_OVERLAY.OVY_25.SINIT_START (linker command file) #>02259F20 SDK_OVERLAY.OVY_25.SINIT_END (linker command file) #>02259F20 SDK_OVERLAY.OVY_25.TEXT_END (linker command file) @@ -226941,5 +226866,5 @@ 00000000 00000000 00000620 check.ITCM 00000000 00000000 00000880 check.DTCM -# Link start time: Wed Oct 18 17:04:48 2023 -# Link end time: Wed Oct 18 17:04:56 2023 +# Link start time: Fri Oct 20 14:48:26 2023 +# Link end time: Fri Oct 20 14:48:35 2023 diff --git a/soulsilverus.xMAP b/soulsilverus.xMAP index 79a06e9b27..51ea453cc3 100644 --- a/soulsilverus.xMAP +++ b/soulsilverus.xMAP @@ -3623,9 +3623,8 @@ 63](sub_0202F1F4,func) found in global save_pokegear.o 62](ScrCmd_811,func) found in global scrcmd_pokemon_misc.o 62](ScrCmd_810,func) found in global scrcmd_c.o - 62](ScrCmd_809,func) found in global overlay_25.o - 63](ov01_021EF348,func) found in global scrcmd_message.o - 63](.rodata,section) found in local overlay_25.o + 62](ScrCmd_ShowTrainerHouseIntroMessage,func) found in global overlay_25.o + 63](Save_TrainerHouse_Get,func) found in global save_trainer_house.o 63](ov01_021EF564,func) found in global scrcmd_message.o 64](ovFieldMain_GetMsgBoxParameters,func) found in local scrcmd_message.o 64](ovFieldMain_CreateMessageBox,func) found in local scrcmd_message.o @@ -3633,9 +3632,8 @@ 64](ovFieldMain_GetTextFrameDelay,func) found in local scrcmd_message.o 64](ov01_021EF758,func) found in local scrcmd_message.o 64](ovFieldMain_AddTextPrinterParameterized,func) found in local scrcmd_message.o - 63](Save_TrainerHouse_Get,func) found in global save_trainer_house.o - 63](CallTask_020509F0,func) found in global encounter.o - 64](Task_020509F0,func) found in local encounter.o + 63](TrainerHouse_DefaultIntroMessage,object) found in local overlay_25.o + 63](ov01_021EF348,func) found in global scrcmd_message.o 62](ScrCmd_SetTrainerHouseSprite,func) found in global unk_0206D494.o 63](TrainerHouseSet_CheckHasData,func) found in global save_trainer_house.o 62](ScrCmd_806,func) found in global scrcmd_c.o @@ -5719,6 +5717,14 @@ 48](FieldSystem_SetFollowerPokeParam,func) found in global field_follow_poke.o 48](FieldSystemUnkSub108_Set,func) found in global field_follow_poke.o 47](GF_GetNumPendingVramTransferTasks,func) found in global vram_transfer_manager.o + 47](TrainerHouse_StartBattle,func) found in global overlay_25.o + 48](TrainerHouse_SetNames,func) found in local overlay_25.o + 48](TrainerHouse_NewBattleSetup,func) found in local overlay_25.o + 49](TrainerHouse_InitBattleSetup,func) found in local overlay_25.o + 50](TrainerHouse_InitTrainer,func) found in local overlay_25.o + 50](TrainerHouse_CopyToPokemon,func) found in local overlay_25.o + 48](CallTask_020509F0,func) found in global encounter.o + 49](Task_020509F0,func) found in local encounter.o 46](sub_0205F1AC,func) found in global field_map_object.o 46](MapObject_SetFlag28,func) found in global field_map_object.o 46](MapObject_SetFlag24,func) found in global field_map_object.o @@ -111872,111 +111878,30 @@ #>00000019 SDK_OVERLAY.OVY_25.ID (linker command file) #>022598C0 SDK_OVERLAY.OVY_25.START (linker command file) #>022598C0 SDK_OVERLAY.OVY_25.TEXT_START (linker command file) - 022598C0 00000088 .text ov25_022598C0 (overlay_25.o) - 022598C0 000004C4 .text .text (overlay_25.o) 022598C0 00000000 .text $t (overlay_25.o) - 022598CA 00000000 .text $b (overlay_25.o) - 022598D6 00000000 .text $b (overlay_25.o) - 022598DE 00000000 .text $b (overlay_25.o) - 022598EE 00000000 .text $b (overlay_25.o) - 022598F8 00000000 .text $b (overlay_25.o) - 02259908 00000000 .text $b (overlay_25.o) - 02259918 00000000 .text $b (overlay_25.o) - 02259920 00000000 .text $b (overlay_25.o) - 0225992A 00000000 .text $b (overlay_25.o) - 02259938 00000000 .text $b (overlay_25.o) + 022598C0 00000088 .text TrainerHouse_StartBattle (overlay_25.o) 02259940 00000000 .text $d (overlay_25.o) 02259948 00000000 .text $t (overlay_25.o) - 02259948 000000E8 .text ov25_02259948 (overlay_25.o) - 02259954 00000000 .text $b (overlay_25.o) - 02259960 00000000 .text $b (overlay_25.o) - 02259968 00000000 .text $b (overlay_25.o) - 02259974 00000000 .text $b (overlay_25.o) - 0225997C 00000000 .text $b (overlay_25.o) - 02259984 00000000 .text $b (overlay_25.o) - 0225998E 00000000 .text $b (overlay_25.o) - 02259998 00000000 .text $b (overlay_25.o) - 022599AA 00000000 .text $b (overlay_25.o) - 022599B0 00000000 .text $b (overlay_25.o) - 022599BA 00000000 .text $b (overlay_25.o) - 022599C0 00000000 .text $b (overlay_25.o) - 022599D2 00000000 .text $b (overlay_25.o) - 022599DA 00000000 .text $b (overlay_25.o) - 022599E4 00000000 .text $b (overlay_25.o) - 022599EE 00000000 .text $b (overlay_25.o) - 02259A00 00000000 .text $b (overlay_25.o) - 02259A06 00000000 .text $b (overlay_25.o) - 02259A10 00000000 .text $b (overlay_25.o) - 02259A16 00000000 .text $b (overlay_25.o) + 02259948 000000E8 .text TrainerHouse_SetNames (overlay_25.o) 02259A24 00000000 .text $d (overlay_25.o) - 02259A30 0000007C .text ScrCmd_809 (overlay_25.o) 02259A30 00000000 .text $t (overlay_25.o) - 02259A36 00000000 .text $b (overlay_25.o) - 02259A42 00000000 .text $b (overlay_25.o) - 02259A50 00000000 .text $b (overlay_25.o) - 02259A5C 00000000 .text $b (overlay_25.o) - 02259A66 00000000 .text $b (overlay_25.o) - 02259A7A 00000000 .text $b (overlay_25.o) - 02259A92 00000000 .text $b (overlay_25.o) - 02259A9A 00000000 .text $b (overlay_25.o) + 02259A30 0000007C .text ScrCmd_ShowTrainerHouseIntroMessage (overlay_25.o) 02259AA4 00000000 .text $d (overlay_25.o) 02259AAC 00000000 .text $t (overlay_25.o) - 02259AAC 000000E4 .text ov25_02259AAC (overlay_25.o) - 02259AB8 00000000 .text $b (overlay_25.o) - 02259AC2 00000000 .text $b (overlay_25.o) - 02259AE2 00000000 .text $b (overlay_25.o) - 02259AF6 00000000 .text $b (overlay_25.o) - 02259AFE 00000000 .text $b (overlay_25.o) - 02259B08 00000000 .text $b (overlay_25.o) - 02259B16 00000000 .text $b (overlay_25.o) - 02259B1C 00000000 .text $b (overlay_25.o) - 02259B26 00000000 .text $b (overlay_25.o) - 02259B34 00000000 .text $b (overlay_25.o) - 02259B3A 00000000 .text $b (overlay_25.o) - 02259B46 00000000 .text $b (overlay_25.o) - 02259B4C 00000000 .text $b (overlay_25.o) - 02259B56 00000000 .text $b (overlay_25.o) - 02259B62 00000000 .text $b (overlay_25.o) - 02259B68 00000000 .text $b (overlay_25.o) - 02259B72 00000000 .text $b (overlay_25.o) + 02259AAC 000000E4 .text TrainerHouse_NewBattleSetup (overlay_25.o) 02259B8C 00000000 .text $d (overlay_25.o) - 02259B90 00000134 .text ov25_02259B90 (overlay_25.o) 02259B90 00000000 .text $t (overlay_25.o) - 02259B9A 00000000 .text $b (overlay_25.o) - 02259BC2 00000000 .text $b (overlay_25.o) - 02259BD8 00000000 .text $b (overlay_25.o) - 02259BE2 00000000 .text $b (overlay_25.o) - 02259BFE 00000000 .text $b (overlay_25.o) - 02259C1A 00000000 .text $b (overlay_25.o) - 02259C26 00000000 .text $b (overlay_25.o) - 02259C36 00000000 .text $b (overlay_25.o) - 02259C52 00000000 .text $b (overlay_25.o) - 02259C6A 00000000 .text $b (overlay_25.o) - 02259C7C 00000000 .text $b (overlay_25.o) - 02259C88 00000000 .text $b (overlay_25.o) - 02259C90 00000000 .text $b (overlay_25.o) - 02259C9C 00000000 .text $b (overlay_25.o) - 02259CA6 00000000 .text $b (overlay_25.o) - 02259CB2 00000000 .text $b (overlay_25.o) - 02259CB8 00000000 .text $b (overlay_25.o) + 02259B90 00000134 .text TrainerHouse_CopyToPokemon (overlay_25.o) 02259CC0 00000000 .text $d (overlay_25.o) - 02259CC4 00000050 .text ov25_02259CC4 (overlay_25.o) + 02259CC4 0000004E .text TrainerHouse_InitTrainer (overlay_25.o) 02259CC4 00000000 .text $t (overlay_25.o) - 02259CD0 00000000 .text $b (overlay_25.o) - 02259CDA 00000000 .text $b (overlay_25.o) - 02259CF0 00000000 .text $b (overlay_25.o) - 02259CFC 00000000 .text $b (overlay_25.o) - 02259D08 00000000 .text $b (overlay_25.o) - 02259D12 00000000 .text $d (overlay_25.o) - 02259D14 00000070 .text ov25_02259D14 (overlay_25.o) + 02259D14 00000070 .text TrainerHouse_InitBattleSetup (overlay_25.o) 02259D14 00000000 .text $t (overlay_25.o) - 02259D2C 00000000 .text $b (overlay_25.o) - 02259D3E 00000000 .text $b (overlay_25.o) - 02259D4C 00000000 .text $b (overlay_25.o) - 02259D62 00000000 .text $b (overlay_25.o) - 02259D6C 00000000 .text $b (overlay_25.o) - 02259D7C 00000000 .text $b (overlay_25.o) - 02259D84 00000198 .rodata .rodata (overlay_25.o) + 02259D84 00000000 .rodata .rodata (overlay_25.o) + 02259D84 00000008 .rodata TrainerHouse_DefaultIntroMessage (overlay_25.o) + 02259D8C 00000008 .rodata TrainerHouse_DefaultWinMessage (overlay_25.o) + 02259D94 00000008 .rodata TrainerHouse_DefaultLoseMessage (overlay_25.o) + 02259D9C 00000180 .rodata ov25_02259D9C (overlay_25.o) #>02259F1C SDK_OVERLAY.OVY_25.SINIT_START (linker command file) #>02259F20 SDK_OVERLAY.OVY_25.SINIT_END (linker command file) #>02259F20 SDK_OVERLAY.OVY_25.TEXT_END (linker command file) @@ -226941,5 +226866,5 @@ 00000000 00000000 00000620 check.ITCM 00000000 00000000 00000880 check.DTCM -# Link start time: Wed Oct 18 17:06:58 2023 -# Link end time: Wed Oct 18 17:07:06 2023 +# Link start time: Fri Oct 20 14:51:18 2023 +# Link end time: Fri Oct 20 14:51:27 2023