Skip to content

Commit

Permalink
Merge pull request #342 from red031000/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrienntindall
adrienntindall committed Oct 8, 2024
1 parent 75f0e90 commit 58f5cb1
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 34 deletions.
44 changes: 27 additions & 17 deletions heartgoldus.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,8 @@
26](MomsSavingsInit,func) found in local save_pokegear.o
27](sub_0202EFC4,func) found in local save_pokegear.o
24](SaveData_GSPlayerMisc_sizeof,func) found in global save_pokegear.o
24](Save_FollowMon_Init,func) found in global unk_0202ED18.o
24](Save_FollowMon_Init,func) found in global save_follow_mon.o
24](Save_FollowMon_sizeof,func) found in global save_follow_mon.o
24](sub_020318CC,func) found in global unk_020318C8.o
24](sub_02031710,func) found in global unk_0203170C.o
25](SaveSubstruct_UpdateCRC,func) found in global save.o
Expand Down Expand Up @@ -3243,6 +3244,8 @@
44](FollowMon_InitMapObject,func) found in global follow_mon.o
45](MapObjectManager_GetFieldSystemPtr,func) found in global map_object.o
45](FollowMon_Clear,func) found in local follow_mon.o
45](Save_FollowMon_Get,func) found in global save_follow_mon.o
45](Save_FollowMon_SetUnused2bitField,func) found in global save_follow_mon.o
45](GetFirstNonEggInParty,func) found in global script_pokemon_util.o
45](GetFirstAliveMonInParty_CrashIfNone,func) found in global script_pokemon_util.o
45](FollowMon_CreateMapObject,func) found in local follow_mon.o
Expand Down Expand Up @@ -3977,6 +3980,7 @@
95](StartMapLoadScript,func) found in global fieldmap.o
96](RunScriptCommand,func) found in global script.o
96](DestroyScriptContext,func) found in global fieldmap.o
94](Save_FollowMon_SetInhibitFlagState,func) found in global save_follow_mon.o
94](ClearFlag99A,func) found in global sys_flags.o
93](sub_0205316C,func) found in local field_warp_tasks.o
94](LocalFieldData_GetPlayer,func) found in global save_local_field_data.o
Expand Down Expand Up @@ -4652,6 +4656,8 @@
67](NewFieldTransitionEnvironment,func) found in global unk_02055BF0.o
68](sub_02055DBC,func) found in global unk_02055BF0.o
69](FollowMon_GetPermission,func) found in global follow_mon.o
70](Save_FollowMon_GetMapID,func) found in global save_follow_mon.o
69](Save_FollowMon_SetMapID,func) found in global save_follow_mon.o
69](Camera_SetHistoryUnk24,func) found in global camera.o
69](MapPreviewGraphic_GetIndex,func) found in global map_preview_graphic.o
70](sMapPreviewGraphicData,object) found in local map_preview_graphic.o
Expand Down Expand Up @@ -7914,6 +7920,7 @@
49](sub_0205F16C,func) found in global map_object.o
45](FieldSystem_SetFollowerPokeParam,func) found in global follow_mon.o
45](FieldSystem_UnkSub108_Set,func) found in global follow_mon.o
45](Save_FollowMon_GetInhibitFlagState,func) found in global save_follow_mon.o
44](GF_GetNumPendingVramTransferTasks,func) found in global vram_transfer_manager.o
44](TrainerHouse_StartBattle,func) found in global overlay_25.o
45](TrainerHouse_SetNames,func) found in local overlay_25.o
Expand Down Expand Up @@ -18534,20 +18541,23 @@
0202ECC0 00000000 .text $t (update_dex_received.o)
0202ECC0 00000058 .text UpdatePokedexWithReceivedSpecies (update_dex_received.o)
0202ED14 00000000 .text $d (update_dex_received.o)
0202ED18 00000000 .text $t (unk_0202ED18.o)
0202ED18 0000005C .text .text (unk_0202ED18.o)
0202ED18 00000004 .text Save_FollowMon_sizeof (unk_0202ED18.o)
0202ED1C 00000018 .text Save_FollowMon_Init (unk_0202ED18.o)
0202ED32 00000000 .text $d (unk_0202ED18.o)
0202ED34 00000000 .text $t (unk_0202ED18.o)
0202ED34 0000000C .text Save_FollowMon_Get (unk_0202ED18.o)
0202ED3C 00000000 .text $d (unk_0202ED18.o)
0202ED40 00000000 .text $t (unk_0202ED18.o)
0202ED40 00000004 .text Save_FollowMon_SetMapId (unk_0202ED18.o)
0202ED44 00000004 .text Save_FollowMon_GetMapId (unk_0202ED18.o)
0202ED48 00000010 .text Save_FollowMon_SetUnused2bitField (unk_0202ED18.o)
0202ED58 00000010 .text Save_FollowMon_SetInhibitFlagState (unk_0202ED18.o)
0202ED68 0000000C .text Save_FollowMon_GetInhibitFlagState (unk_0202ED18.o)
0202ED18 00000004 .text Save_FollowMon_sizeof (save_follow_mon.o)
0202ED18 00000000 .text $t (save_follow_mon.o)
0202ED1C 00000016 .text Save_FollowMon_Init (save_follow_mon.o)
0202ED1C 00000000 .text $t (save_follow_mon.o)
0202ED34 00000000 .text $t (save_follow_mon.o)
0202ED34 0000000C .text Save_FollowMon_Get (save_follow_mon.o)
0202ED3C 00000000 .text $d (save_follow_mon.o)
0202ED40 00000004 .text Save_FollowMon_SetMapID (save_follow_mon.o)
0202ED40 00000000 .text $t (save_follow_mon.o)
0202ED44 00000004 .text Save_FollowMon_GetMapID (save_follow_mon.o)
0202ED44 00000000 .text $t (save_follow_mon.o)
0202ED48 00000010 .text Save_FollowMon_SetUnused2bitField (save_follow_mon.o)
0202ED48 00000000 .text $t (save_follow_mon.o)
0202ED58 00000010 .text Save_FollowMon_SetInhibitFlagState (save_follow_mon.o)
0202ED58 00000000 .text $t (save_follow_mon.o)
0202ED68 0000000C .text Save_FollowMon_GetInhibitFlagState (save_follow_mon.o)
0202ED68 00000000 .text $t (save_follow_mon.o)
0202ED74 00000000 .text $t (save_pokegear.o)
0202ED74 00000008 .text SaveData_GSPlayerMisc_sizeof (save_pokegear.o)
0202ED78 00000000 .text $d (save_pokegear.o)
Expand Down Expand Up @@ -218613,5 +218623,5 @@
00000000 00000000 00000620 check.ITCM
00000000 00000000 00000880 check.DTCM

# Link start time: Mon Oct 07 03:06:06 2024
# Link end time: Mon Oct 07 03:06:11 2024
# Link start time: Tue Oct 08 01:08:04 2024
# Link end time: Tue Oct 08 01:08:09 2024
44 changes: 27 additions & 17 deletions soulsilverus.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,8 @@
26](MomsSavingsInit,func) found in local save_pokegear.o
27](sub_0202EFC4,func) found in local save_pokegear.o
24](SaveData_GSPlayerMisc_sizeof,func) found in global save_pokegear.o
24](Save_FollowMon_Init,func) found in global unk_0202ED18.o
24](Save_FollowMon_Init,func) found in global save_follow_mon.o
24](Save_FollowMon_sizeof,func) found in global save_follow_mon.o
24](sub_020318CC,func) found in global unk_020318C8.o
24](sub_02031710,func) found in global unk_0203170C.o
25](SaveSubstruct_UpdateCRC,func) found in global save.o
Expand Down Expand Up @@ -3243,6 +3244,8 @@
44](FollowMon_InitMapObject,func) found in global follow_mon.o
45](MapObjectManager_GetFieldSystemPtr,func) found in global map_object.o
45](FollowMon_Clear,func) found in local follow_mon.o
45](Save_FollowMon_Get,func) found in global save_follow_mon.o
45](Save_FollowMon_SetUnused2bitField,func) found in global save_follow_mon.o
45](GetFirstNonEggInParty,func) found in global script_pokemon_util.o
45](GetFirstAliveMonInParty_CrashIfNone,func) found in global script_pokemon_util.o
45](FollowMon_CreateMapObject,func) found in local follow_mon.o
Expand Down Expand Up @@ -3977,6 +3980,7 @@
95](StartMapLoadScript,func) found in global fieldmap.o
96](RunScriptCommand,func) found in global script.o
96](DestroyScriptContext,func) found in global fieldmap.o
94](Save_FollowMon_SetInhibitFlagState,func) found in global save_follow_mon.o
94](ClearFlag99A,func) found in global sys_flags.o
93](sub_0205316C,func) found in local field_warp_tasks.o
94](LocalFieldData_GetPlayer,func) found in global save_local_field_data.o
Expand Down Expand Up @@ -4652,6 +4656,8 @@
67](NewFieldTransitionEnvironment,func) found in global unk_02055BF0.o
68](sub_02055DBC,func) found in global unk_02055BF0.o
69](FollowMon_GetPermission,func) found in global follow_mon.o
70](Save_FollowMon_GetMapID,func) found in global save_follow_mon.o
69](Save_FollowMon_SetMapID,func) found in global save_follow_mon.o
69](Camera_SetHistoryUnk24,func) found in global camera.o
69](MapPreviewGraphic_GetIndex,func) found in global map_preview_graphic.o
70](sMapPreviewGraphicData,object) found in local map_preview_graphic.o
Expand Down Expand Up @@ -7914,6 +7920,7 @@
49](sub_0205F16C,func) found in global map_object.o
45](FieldSystem_SetFollowerPokeParam,func) found in global follow_mon.o
45](FieldSystem_UnkSub108_Set,func) found in global follow_mon.o
45](Save_FollowMon_GetInhibitFlagState,func) found in global save_follow_mon.o
44](GF_GetNumPendingVramTransferTasks,func) found in global vram_transfer_manager.o
44](TrainerHouse_StartBattle,func) found in global overlay_25.o
45](TrainerHouse_SetNames,func) found in local overlay_25.o
Expand Down Expand Up @@ -18534,20 +18541,23 @@
0202ECC0 00000000 .text $t (update_dex_received.o)
0202ECC0 00000058 .text UpdatePokedexWithReceivedSpecies (update_dex_received.o)
0202ED14 00000000 .text $d (update_dex_received.o)
0202ED18 00000000 .text $t (unk_0202ED18.o)
0202ED18 0000005C .text .text (unk_0202ED18.o)
0202ED18 00000004 .text Save_FollowMon_sizeof (unk_0202ED18.o)
0202ED1C 00000018 .text Save_FollowMon_Init (unk_0202ED18.o)
0202ED32 00000000 .text $d (unk_0202ED18.o)
0202ED34 00000000 .text $t (unk_0202ED18.o)
0202ED34 0000000C .text Save_FollowMon_Get (unk_0202ED18.o)
0202ED3C 00000000 .text $d (unk_0202ED18.o)
0202ED40 00000000 .text $t (unk_0202ED18.o)
0202ED40 00000004 .text Save_FollowMon_SetMapId (unk_0202ED18.o)
0202ED44 00000004 .text Save_FollowMon_GetMapId (unk_0202ED18.o)
0202ED48 00000010 .text Save_FollowMon_SetUnused2bitField (unk_0202ED18.o)
0202ED58 00000010 .text Save_FollowMon_SetInhibitFlagState (unk_0202ED18.o)
0202ED68 0000000C .text Save_FollowMon_GetInhibitFlagState (unk_0202ED18.o)
0202ED18 00000004 .text Save_FollowMon_sizeof (save_follow_mon.o)
0202ED18 00000000 .text $t (save_follow_mon.o)
0202ED1C 00000016 .text Save_FollowMon_Init (save_follow_mon.o)
0202ED1C 00000000 .text $t (save_follow_mon.o)
0202ED34 00000000 .text $t (save_follow_mon.o)
0202ED34 0000000C .text Save_FollowMon_Get (save_follow_mon.o)
0202ED3C 00000000 .text $d (save_follow_mon.o)
0202ED40 00000004 .text Save_FollowMon_SetMapID (save_follow_mon.o)
0202ED40 00000000 .text $t (save_follow_mon.o)
0202ED44 00000004 .text Save_FollowMon_GetMapID (save_follow_mon.o)
0202ED44 00000000 .text $t (save_follow_mon.o)
0202ED48 00000010 .text Save_FollowMon_SetUnused2bitField (save_follow_mon.o)
0202ED48 00000000 .text $t (save_follow_mon.o)
0202ED58 00000010 .text Save_FollowMon_SetInhibitFlagState (save_follow_mon.o)
0202ED58 00000000 .text $t (save_follow_mon.o)
0202ED68 0000000C .text Save_FollowMon_GetInhibitFlagState (save_follow_mon.o)
0202ED68 00000000 .text $t (save_follow_mon.o)
0202ED74 00000000 .text $t (save_pokegear.o)
0202ED74 00000008 .text SaveData_GSPlayerMisc_sizeof (save_pokegear.o)
0202ED78 00000000 .text $d (save_pokegear.o)
Expand Down Expand Up @@ -218613,5 +218623,5 @@
00000000 00000000 00000620 check.ITCM
00000000 00000000 00000880 check.DTCM

# Link start time: Mon Oct 07 03:07:56 2024
# Link end time: Mon Oct 07 03:08:02 2024
# Link start time: Tue Oct 08 01:10:04 2024
# Link end time: Tue Oct 08 01:10:10 2024

0 comments on commit 58f5cb1

Please sign in to comment.