Skip to content

Commit

Permalink
Merge pull request #269 from red031000/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrienntindall
adrienntindall committed Dec 19, 2023
1 parent be90da5 commit dee4ac9
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 68 deletions.
68 changes: 34 additions & 34 deletions heartgoldus.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3370,12 +3370,12 @@
69](HealParty,func) found in global use_item_on_mon.o
67](Task_WildEncounter,func) found in local encounter.o
68](WildEncounter_Delete,func) found in local encounter.o
68](FieldTask_BlackOut,func) found in global field_black_out.o
69](DrawBlackoutMessage,func) found in local field_black_out.o
70](_InitDisplays,func) found in local field_black_out.o
71](_020FC550$6407,object) found in local field_black_out.o
70](_PrintMessage,func) found in local field_black_out.o
70](FieldTask_ShowPrintedMessage,func) found in local field_black_out.o
68](Task_Blackout,func) found in global blackout.o
69](Blackout_DrawMessage,func) found in local blackout.o
70](Blackout_InitDisplays,func) found in local blackout.o
71](sBlackoutGraphicsBanks,object) found in local blackout.o
70](Blackout_PrintMessage,func) found in local blackout.o
70](Task_ShowPrintedBlackoutMessage,func) found in local blackout.o
66](EnemyTrainerSet_Init,func) found in global trainer_data.o
67](CreateNPCTrainerParty,func) found in global trainer_data.o
68](TrainerData_ReadTrPoke,func) found in global trainer_data.o
Expand Down Expand Up @@ -3420,7 +3420,7 @@
65](sub_020910B8,func) found in global unk_02091054.o
66](_02105F04,object) found in local unk_02091054.o
65](GetItemDescIntoString,func) found in global item.o
65](GfGfx_EngineBGetPlanes,func) found in global gf_gfx_planes.o
65](GfGfx_EngineAGetPlanes,func) found in global gf_gfx_planes.o
65](CheckFlag09A,func) found in global sys_flags.o
65](Save_SealCase_Get,func) found in global seal_case.o
65](sub_020669B4,func) found in global sys_flags.o
Expand Down Expand Up @@ -4679,7 +4679,7 @@
62](ScrCmd_GetPlayerGender,func) found in global scrcmd_c.o
62](ScrCmd_SetSpawn,func) found in global scrcmd_c.o
62](ScrCmd_OverworldWhiteOut,func) found in global scrcmd_c.o
63](CallFieldTask_BlackOut,func) found in global field_black_out.o
63](CallTask_Blackout,func) found in global blackout.o
62](ScrCmd_SealMart,func) found in global scrcmd_mart.o
62](ScrCmd_DecorationMart,func) found in global scrcmd_mart.o
62](ScrCmd_SpecialMartBuy,func) found in global scrcmd_mart.o
Expand Down Expand Up @@ -14929,7 +14929,7 @@
02022D3C 0000002C .text GfGfx_SwapDisplay (gf_gfx_planes.o)
02022D5C 00000000 .text $d (gf_gfx_planes.o)
02022D68 00000000 .text $t (gf_gfx_planes.o)
02022D68 0000000C .text GfGfx_EngineBGetPlanes (gf_gfx_planes.o)
02022D68 0000000C .text GfGfx_EngineAGetPlanes (gf_gfx_planes.o)
02022D70 00000000 .text $d (gf_gfx_planes.o)
02022D74 00000000 .text $t (camera.o)
02022D74 000000E0 .text Camera_CalcLookAtPosFromTargetAndAngle (camera.o)
Expand Down Expand Up @@ -26682,24 +26682,24 @@
02052574 00000000 .text $t (battle_setup.o)
02052580 0000003C .text BattleSetup_SetAllySideBattlersToPlayer (battle_setup.o)
02052580 00000000 .text $t (battle_setup.o)
020525BC 00000000 .text $t (field_black_out.o)
020525BC 00000050 .text _InitDisplays (field_black_out.o)
020525FC 00000000 .text $d (field_black_out.o)
0205260C 00000000 .text $t (field_black_out.o)
0205260C 000000C8 .text DrawBlackoutMessage (field_black_out.o)
020526C8 00000000 .text $d (field_black_out.o)
020526D4 00000000 .text $t (field_black_out.o)
020526D4 000000FC .text FieldTask_ShowPrintedMessage (field_black_out.o)
020527C0 00000000 .text $d (field_black_out.o)
020527D0 00000000 .text $t (field_black_out.o)
020527D0 00000088 .text _PrintMessage (field_black_out.o)
02052854 00000000 .text $d (field_black_out.o)
02052858 00000000 .text $t (field_black_out.o)
02052858 00000124 .text FieldTask_BlackOut (field_black_out.o)
02052974 00000000 .text $d (field_black_out.o)
0205297C 00000000 .text $t (field_black_out.o)
0205297C 00000010 .text CallFieldTask_BlackOut (field_black_out.o)
02052984 00000000 .text $d (field_black_out.o)
020525BC 00000000 .text $t (blackout.o)
020525BC 00000050 .text Blackout_InitDisplays (blackout.o)
020525FC 00000000 .text $d (blackout.o)
0205260C 00000000 .text $t (blackout.o)
0205260C 000000C8 .text Blackout_DrawMessage (blackout.o)
020526C8 00000000 .text $d (blackout.o)
020526D4 00000000 .text $t (blackout.o)
020526D4 000000FC .text Task_ShowPrintedBlackoutMessage (blackout.o)
020527C0 00000000 .text $d (blackout.o)
020527D0 00000000 .text $t (blackout.o)
020527D0 00000088 .text Blackout_PrintMessage (blackout.o)
02052854 00000000 .text $d (blackout.o)
02052858 00000000 .text $t (blackout.o)
02052858 00000124 .text Task_Blackout (blackout.o)
02052974 00000000 .text $d (blackout.o)
0205297C 00000000 .text $t (blackout.o)
0205297C 00000010 .text CallTask_Blackout (blackout.o)
02052984 00000000 .text $d (blackout.o)
0205298C 00000000 .text $t (game_clear.o)
0205298C 000000C4 .text sub_0205298C (game_clear.o)
02052A48 00000000 .text $d (game_clear.o)
Expand Down Expand Up @@ -50949,11 +50949,11 @@
020FC3B4 0000010C .rodata .rodata (unk_020517A4.o)
020FC4C0 00000000 .rodata .rodata (battle_setup.o)
020FC4C0 0000005C .rodata _020FC4C0 (battle_setup.o)
020FC51C 00000000 .rodata .rodata (field_black_out.o)
020FC51C 00000008 .rodata _020FC51C$6416 (field_black_out.o)
020FC524 00000010 .rodata _020FC524$6408 (field_black_out.o)
020FC534 0000001C .rodata _020FC534$6409 (field_black_out.o)
020FC550 00000028 .rodata _020FC550$6407 (field_black_out.o)
020FC51C 00000000 .rodata .rodata (blackout.o)
020FC51C 00000008 .rodata sBlackoutWindowTemplate (blackout.o)
020FC524 00000010 .rodata sBlackoutGraphicsModes (blackout.o)
020FC534 0000001C .rodata sBlackoutBgTemplate (blackout.o)
020FC550 00000028 .rodata sBlackoutGraphicsBanks (blackout.o)
020FC578 00000010 .rodata sGameClearSaveBgModeSet (game_clear.o)
020FC578 00000000 .rodata .rodata (game_clear.o)
020FC588 0000001C .rodata sGameClearSaveBgTemplate (game_clear.o)
Expand Down Expand Up @@ -226247,5 +226247,5 @@
00000000 00000000 00000620 check.ITCM
00000000 00000000 00000880 check.DTCM

# Link start time: Sat Dec 16 23:03:39 2023
# Link end time: Sat Dec 16 23:03:45 2023
# Link start time: Tue Dec 19 16:45:23 2023
# Link end time: Tue Dec 19 16:45:29 2023
68 changes: 34 additions & 34 deletions soulsilverus.xMAP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3370,12 +3370,12 @@
69](HealParty,func) found in global use_item_on_mon.o
67](Task_WildEncounter,func) found in local encounter.o
68](WildEncounter_Delete,func) found in local encounter.o
68](FieldTask_BlackOut,func) found in global field_black_out.o
69](DrawBlackoutMessage,func) found in local field_black_out.o
70](_InitDisplays,func) found in local field_black_out.o
71](_020FC550$6407,object) found in local field_black_out.o
70](_PrintMessage,func) found in local field_black_out.o
70](FieldTask_ShowPrintedMessage,func) found in local field_black_out.o
68](Task_Blackout,func) found in global blackout.o
69](Blackout_DrawMessage,func) found in local blackout.o
70](Blackout_InitDisplays,func) found in local blackout.o
71](sBlackoutGraphicsBanks,object) found in local blackout.o
70](Blackout_PrintMessage,func) found in local blackout.o
70](Task_ShowPrintedBlackoutMessage,func) found in local blackout.o
66](EnemyTrainerSet_Init,func) found in global trainer_data.o
67](CreateNPCTrainerParty,func) found in global trainer_data.o
68](TrainerData_ReadTrPoke,func) found in global trainer_data.o
Expand Down Expand Up @@ -3420,7 +3420,7 @@
65](sub_020910B8,func) found in global unk_02091054.o
66](_02105F04,object) found in local unk_02091054.o
65](GetItemDescIntoString,func) found in global item.o
65](GfGfx_EngineBGetPlanes,func) found in global gf_gfx_planes.o
65](GfGfx_EngineAGetPlanes,func) found in global gf_gfx_planes.o
65](CheckFlag09A,func) found in global sys_flags.o
65](Save_SealCase_Get,func) found in global seal_case.o
65](sub_020669B4,func) found in global sys_flags.o
Expand Down Expand Up @@ -4679,7 +4679,7 @@
62](ScrCmd_GetPlayerGender,func) found in global scrcmd_c.o
62](ScrCmd_SetSpawn,func) found in global scrcmd_c.o
62](ScrCmd_OverworldWhiteOut,func) found in global scrcmd_c.o
63](CallFieldTask_BlackOut,func) found in global field_black_out.o
63](CallTask_Blackout,func) found in global blackout.o
62](ScrCmd_SealMart,func) found in global scrcmd_mart.o
62](ScrCmd_DecorationMart,func) found in global scrcmd_mart.o
62](ScrCmd_SpecialMartBuy,func) found in global scrcmd_mart.o
Expand Down Expand Up @@ -14929,7 +14929,7 @@
02022D3C 0000002C .text GfGfx_SwapDisplay (gf_gfx_planes.o)
02022D5C 00000000 .text $d (gf_gfx_planes.o)
02022D68 00000000 .text $t (gf_gfx_planes.o)
02022D68 0000000C .text GfGfx_EngineBGetPlanes (gf_gfx_planes.o)
02022D68 0000000C .text GfGfx_EngineAGetPlanes (gf_gfx_planes.o)
02022D70 00000000 .text $d (gf_gfx_planes.o)
02022D74 00000000 .text $t (camera.o)
02022D74 000000E0 .text Camera_CalcLookAtPosFromTargetAndAngle (camera.o)
Expand Down Expand Up @@ -26682,24 +26682,24 @@
02052574 00000000 .text $t (battle_setup.o)
02052580 0000003C .text BattleSetup_SetAllySideBattlersToPlayer (battle_setup.o)
02052580 00000000 .text $t (battle_setup.o)
020525BC 00000000 .text $t (field_black_out.o)
020525BC 00000050 .text _InitDisplays (field_black_out.o)
020525FC 00000000 .text $d (field_black_out.o)
0205260C 00000000 .text $t (field_black_out.o)
0205260C 000000C8 .text DrawBlackoutMessage (field_black_out.o)
020526C8 00000000 .text $d (field_black_out.o)
020526D4 00000000 .text $t (field_black_out.o)
020526D4 000000FC .text FieldTask_ShowPrintedMessage (field_black_out.o)
020527C0 00000000 .text $d (field_black_out.o)
020527D0 00000000 .text $t (field_black_out.o)
020527D0 00000088 .text _PrintMessage (field_black_out.o)
02052854 00000000 .text $d (field_black_out.o)
02052858 00000000 .text $t (field_black_out.o)
02052858 00000124 .text FieldTask_BlackOut (field_black_out.o)
02052974 00000000 .text $d (field_black_out.o)
0205297C 00000000 .text $t (field_black_out.o)
0205297C 00000010 .text CallFieldTask_BlackOut (field_black_out.o)
02052984 00000000 .text $d (field_black_out.o)
020525BC 00000000 .text $t (blackout.o)
020525BC 00000050 .text Blackout_InitDisplays (blackout.o)
020525FC 00000000 .text $d (blackout.o)
0205260C 00000000 .text $t (blackout.o)
0205260C 000000C8 .text Blackout_DrawMessage (blackout.o)
020526C8 00000000 .text $d (blackout.o)
020526D4 00000000 .text $t (blackout.o)
020526D4 000000FC .text Task_ShowPrintedBlackoutMessage (blackout.o)
020527C0 00000000 .text $d (blackout.o)
020527D0 00000000 .text $t (blackout.o)
020527D0 00000088 .text Blackout_PrintMessage (blackout.o)
02052854 00000000 .text $d (blackout.o)
02052858 00000000 .text $t (blackout.o)
02052858 00000124 .text Task_Blackout (blackout.o)
02052974 00000000 .text $d (blackout.o)
0205297C 00000000 .text $t (blackout.o)
0205297C 00000010 .text CallTask_Blackout (blackout.o)
02052984 00000000 .text $d (blackout.o)
0205298C 00000000 .text $t (game_clear.o)
0205298C 000000C4 .text sub_0205298C (game_clear.o)
02052A48 00000000 .text $d (game_clear.o)
Expand Down Expand Up @@ -50947,11 +50947,11 @@
020FC3B4 0000010C .rodata .rodata (unk_020517A4.o)
020FC4C0 00000000 .rodata .rodata (battle_setup.o)
020FC4C0 0000005C .rodata _020FC4C0 (battle_setup.o)
020FC51C 00000000 .rodata .rodata (field_black_out.o)
020FC51C 00000008 .rodata _020FC51C$6416 (field_black_out.o)
020FC524 00000010 .rodata _020FC524$6408 (field_black_out.o)
020FC534 0000001C .rodata _020FC534$6409 (field_black_out.o)
020FC550 00000028 .rodata _020FC550$6407 (field_black_out.o)
020FC51C 00000000 .rodata .rodata (blackout.o)
020FC51C 00000008 .rodata sBlackoutWindowTemplate (blackout.o)
020FC524 00000010 .rodata sBlackoutGraphicsModes (blackout.o)
020FC534 0000001C .rodata sBlackoutBgTemplate (blackout.o)
020FC550 00000028 .rodata sBlackoutGraphicsBanks (blackout.o)
020FC578 00000010 .rodata sGameClearSaveBgModeSet (game_clear.o)
020FC578 00000000 .rodata .rodata (game_clear.o)
020FC588 0000001C .rodata sGameClearSaveBgTemplate (game_clear.o)
Expand Down Expand Up @@ -226247,5 +226247,5 @@
00000000 00000000 00000620 check.ITCM
00000000 00000000 00000880 check.DTCM

# Link start time: Sat Dec 16 23:05:13 2023
# Link end time: Sat Dec 16 23:05:19 2023
# Link start time: Tue Dec 19 16:46:58 2023
# Link end time: Tue Dec 19 16:47:04 2023

0 comments on commit dee4ac9

Please sign in to comment.