From 05d32e1f4c730bb78398d36f1dc0703ce6deef49 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Dec 2023 03:35:03 +0000 Subject: [PATCH] Merge pull request #45 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 72 +++++++++++++++++++++++++-------------------------- pmdskyus.xMAP | 72 +++++++++++++++++++++++++-------------------------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 41f87e20..2e753cd7 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -1254,10 +1254,10 @@ 0200B9AC 00000000 .text $d (main_02000C6C.o) 0200B9B0 00000000 .text $a (main_02000C6C.o) 0200B9B0 00000068 .text sub_0200B928 (main_02000C6C.o) - 0200BA18 00000078 .text sub_0200B990 (main_02000C6C.o) + 0200BA18 00000078 .text UpdateFadeStatus (main_02000C6C.o) 0200BA88 00000000 .text $d (main_02000C6C.o) 0200BA90 00000000 .text $a (main_02000C6C.o) - 0200BA90 00000158 .text sub_0200BA08 (main_02000C6C.o) + 0200BA90 00000158 .text HandleFades (main_02000C6C.o) 0200BBE8 00000014 .text sub_0200BB60 (main_02000C6C.o) 0200BBF8 00000000 .text $d (main_02000C6C.o) 0200BBFC 00000000 .text $a (main_02000C6C.o) @@ -1272,7 +1272,7 @@ 0200BCE8 00000050 .text sub_0200BC60 (main_02000C6C.o) 0200BD38 00000064 .text sub_0200BCB0 (main_02000C6C.o) 0200BD9C 00000018 .text sub_0200BD14 (main_02000C6C.o) - 0200BDB4 00000024 .text sub_0200BD2C (main_02000C6C.o) + 0200BDB4 00000024 .text GetFadeStatus (main_02000C6C.o) 0200BDD8 000002B8 .text sub_0200BD50 (main_02000C6C.o) 0200C090 00000018 .text sub_0200C008 (main_02000C6C.o) 0200C0A4 00000000 .text $d (main_02000C6C.o) @@ -3285,7 +3285,7 @@ 020264E8 00000000 .text $a (main_0200C4CC.o) 020264F4 00000000 .text $d (main_0200C4CC.o) 020264F8 00000000 .text $a (main_0200C4CC.o) - 020264F8 00000054 .text sub_02026214 (main_0200C4CC.o) + 020264F8 00000054 .text DrawTextInWindow (main_0200C4CC.o) 02026548 00000000 .text $d (main_0200C4CC.o) 0202654C 00000078 .text sub_02026268 (main_0200C4CC.o) 0202654C 00000000 .text $a (main_0200C4CC.o) @@ -3402,7 +3402,7 @@ 02027E10 00000000 .text $a (main_0200C4CC.o) 02027E10 0000003C .text sub_02027B1C (main_0200C4CC.o) 02027E44 00000000 .text $d (main_0200C4CC.o) - 02027E4C 00000030 .text sub_02027B58 (main_0200C4CC.o) + 02027E4C 00000030 .text ClearWindow (main_0200C4CC.o) 02027E4C 00000000 .text $a (main_0200C4CC.o) 02027E70 00000000 .text $d (main_0200C4CC.o) 02027E7C 00000000 .text $a (main_0200C4CC.o) @@ -5845,12 +5845,12 @@ 020510BC 00000000 .text $a (main_0200C4CC.o) 020510BC 00000084 .text sub_02050D84 (main_0200C4CC.o) 02051134 00000000 .text $d (main_0200C4CC.o) - 02051140 00000010 .text sub_02050E08 (main_0200C4CC.o) + 02051140 00000010 .text ResetPlayTimer (main_0200C4CC.o) 02051140 00000000 .text $a (main_0200C4CC.o) - 02051150 0000003C .text sub_02050E18 (main_0200C4CC.o) + 02051150 0000003C .text PlayTimerTick (main_0200C4CC.o) 02051188 00000000 .text $d (main_0200C4CC.o) 0205118C 00000000 .text $a (main_0200C4CC.o) - 0205118C 00000008 .text sub_02050E54 (main_0200C4CC.o) + 0205118C 00000008 .text GetPlayTimeSeconds (main_0200C4CC.o) 02051194 00000030 .text sub_02050E5C (main_0200C4CC.o) 020511C4 00000030 .text sub_02050E8C (main_0200C4CC.o) 020511F4 00000054 .text sub_02050EBC (main_0200C4CC.o) @@ -19064,7 +19064,7 @@ 023332B0 00000000 .text $a (overlay_01.o) 023336C0 00000000 .text $d (overlay_01.o) 023336D8 00000000 .text $a (overlay_01.o) - 023336D8 00000784 .text ov01_02332EF4 (overlay_01.o) + 023336D8 00000784 .text ProcessContinueScreenContents (overlay_01.o) 02333E00 00000000 .text $d (overlay_01.o) 02333E5C 00000000 .text $a (overlay_01.o) 02333E5C 00000028 .text ov01_02333678 (overlay_01.o) @@ -25706,10 +25706,10 @@ 022C12D8 00000050 .text ov10_022C0998 (overlay_10.o) 022C12D8 00000000 .text $a (overlay_10.o) 022C1324 00000000 .text $d (overlay_10.o) - 022C1328 000002F8 .text ov10_022C09E8 (overlay_10.o) + 022C1328 000002F8 .text DrawTeamStats (overlay_10.o) 022C1328 00000000 .text $a (overlay_10.o) 022C1600 00000000 .text $d (overlay_10.o) - 022C1620 0000028C .text ov10_022C0CE0 (overlay_10.o) + 022C1620 0000028C .text UpdateTeamStats (overlay_10.o) 022C1620 00000000 .text $a (overlay_10.o) 022C189C 00000000 .text $d (overlay_10.o) 022C18AC 0000026C .text ov10_022C0F6C (overlay_10.o) @@ -25721,7 +25721,7 @@ 022C1CD8 0000001C .text ov10_022C1398 (overlay_10.o) 022C1CD8 00000000 .text $a (overlay_10.o) 022C1CEC 00000000 .text $d (overlay_10.o) - 022C1CF4 0000011C .text ov10_022C13B4 (overlay_10.o) + 022C1CF4 0000011C .text FreeTeamStats (overlay_10.o) 022C1CF4 00000000 .text $a (overlay_10.o) 022C1E08 00000000 .text $d (overlay_10.o) 022C1E10 000000CC .text ov10_022C14D0 (overlay_10.o) @@ -25730,7 +25730,7 @@ 022C1EDC 00000148 .text ov10_022C159C (overlay_10.o) 022C1EDC 00000000 .text $a (overlay_10.o) 022C2018 00000000 .text $d (overlay_10.o) - 022C2024 00000070 .text ov10_022C16D8 (overlay_10.o) + 022C2024 00000070 .text FreeMapAndTeam (overlay_10.o) 022C2024 00000000 .text $a (overlay_10.o) 022C2090 00000000 .text $d (overlay_10.o) 022C2094 00000100 .text ProcessTeamStatsLvHp (overlay_10.o) @@ -26793,7 +26793,7 @@ 022EA888 00000000 .text $a (overlay_11.o) 022EA888 00000030 .text ov11_022E9F48 (overlay_11.o) 022EA8B0 00000000 .text $d (overlay_11.o) - 022EA8B8 0000002C .text ov11_022E9F78 (overlay_11.o) + 022EA8B8 0000002C .text IsScreenFadeInProgress (overlay_11.o) 022EA8B8 00000000 .text $a (overlay_11.o) 022EA8DC 00000000 .text $d (overlay_11.o) 022EA8E4 00000000 .text $a (overlay_11.o) @@ -28517,7 +28517,7 @@ 0230EFAC 00000000 .text $d (overlay_11.o) 0230EFB0 00000000 .text $a (overlay_11.o) 0230EFB0 00000004 .text ov11_0230E614 (overlay_11.o) - 0230EFB4 000001D4 .text ov11_0230E618 (overlay_11.o) + 0230EFB4 000001D4 .text HandleControlsTopScreenGround (overlay_11.o) 0230F184 00000000 .text $d (overlay_11.o) 0230F188 000000E4 .text ov11_0230E7EC (overlay_11.o) 0230F188 00000000 .text $a (overlay_11.o) @@ -28900,7 +28900,7 @@ 023144B4 00000000 .text $d (overlay_11.o) 023144B8 00000000 .text $a (overlay_11.o) 023144B8 00000004 .text ov11_02313AD8 (overlay_11.o) - 023144BC 000001D4 .text ov11_02313ADC (overlay_11.o) + 023144BC 000001D4 .text HandleTeamStatsGround (overlay_11.o) 0231468C 00000000 .text $d (overlay_11.o) 02314690 00000000 .text $a (overlay_11.o) 02314690 00000068 .text ov11_02313CB0 (overlay_11.o) @@ -34020,11 +34020,11 @@ 022E8808 00000000 .text $a (overlay_29_022E37DC.o) 022E8808 0000006C .text GetMonsterLevelToSpawn (overlay_29_022E37DC.o) 022E8870 00000000 .text $d (overlay_29_022E37DC.o) - 022E8874 00000080 .text ov29_022E7EC4 (overlay_29_022E37DC.o) + 022E8874 00000080 .text AllocTopScreenStatus (overlay_29_022E37DC.o) 022E8874 00000000 .text $a (overlay_29_022E37DC.o) 022E88F0 00000000 .text $d (overlay_29_022E37DC.o) 022E88F4 00000000 .text $a (overlay_29_022E37DC.o) - 022E88F4 00000038 .text ov29_022E7F44 (overlay_29_022E37DC.o) + 022E88F4 00000038 .text FreeTopScreenStatus (overlay_29_022E37DC.o) 022E8928 00000000 .text $d (overlay_29_022E37DC.o) 022E892C 00000018 .text ov29_022E7F7C (overlay_29_022E37DC.o) 022E892C 00000000 .text $a (overlay_29_022E37DC.o) @@ -34044,15 +34044,15 @@ 022E8AB4 00000000 .text $a (overlay_29_022E37DC.o) 022E8AB4 0000002C .text ov29_022E8104 (overlay_29_022E37DC.o) 022E8ADC 00000000 .text $d (overlay_29_022E37DC.o) - 022E8AE0 00000060 .text ov29_022E8130 (overlay_29_022E37DC.o) + 022E8AE0 00000060 .text InitializeTeamStats (overlay_29_022E37DC.o) 022E8AE0 00000000 .text $a (overlay_29_022E37DC.o) 022E8B3C 00000000 .text $d (overlay_29_022E37DC.o) 022E8B40 00000000 .text $a (overlay_29_022E37DC.o) - 022E8B40 00000038 .text ov29_022E8190 (overlay_29_022E37DC.o) + 022E8B40 00000038 .text UpdateTeamStatsWrapper (overlay_29_022E37DC.o) 022E8B74 00000000 .text $d (overlay_29_022E37DC.o) 022E8B78 00000020 .text ov29_022E81C8 (overlay_29_022E37DC.o) 022E8B78 00000000 .text $a (overlay_29_022E37DC.o) - 022E8B98 00000010 .text ov29_022E81E8 (overlay_29_022E37DC.o) + 022E8B98 00000010 .text FreeTeamStatsWrapper (overlay_29_022E37DC.o) 022E8BA8 0000004C .text ov29_022E81F8 (overlay_29_022E37DC.o) 022E8BF0 00000000 .text $d (overlay_29_022E37DC.o) 022E8BF4 00000000 .text $a (overlay_29_022E37DC.o) @@ -34097,7 +34097,7 @@ 022E9058 00000020 .text ov29_022E86A8 (overlay_29_022E37DC.o) 022E9074 00000000 .text $d (overlay_29_022E37DC.o) 022E9078 00000000 .text $a (overlay_29_022E37DC.o) - 022E9078 0000001C .text ov29_022E86C8 (overlay_29_022E37DC.o) + 022E9078 0000001C .text AssignTopScreenHandlers (overlay_29_022E37DC.o) 022E9094 00000024 .text ov29_022E86E4 (overlay_29_022E37DC.o) 022E90B4 00000000 .text $d (overlay_29_022E37DC.o) 022E90B8 00000000 .text $a (overlay_29_022E37DC.o) @@ -34126,7 +34126,7 @@ 022E91F8 00000024 .text ov29_022E8848 (overlay_29_022E37DC.o) 022E9218 00000000 .text $d (overlay_29_022E37DC.o) 022E921C 00000000 .text $a (overlay_29_022E37DC.o) - 022E921C 00000390 .text ov29_022E886C (overlay_29_022E37DC.o) + 022E921C 00000390 .text HandleTopScreenFades (overlay_29_022E37DC.o) 022E9550 00000000 .text $d (overlay_29_022E37DC.o) 022E95AC 00000000 .text $a (overlay_29_022E37DC.o) 022E95AC 00000014 .text ov29_022E8BFC (overlay_29_022E37DC.o) @@ -34135,7 +34135,7 @@ 022E95C0 0000003C .text ov29_022E8C10 (overlay_29_022E37DC.o) 022E95F8 00000000 .text $d (overlay_29_022E37DC.o) 022E95FC 00000000 .text $a (overlay_29_022E37DC.o) - 022E95FC 0000005C .text ov29_022E8C4C (overlay_29_022E37DC.o) + 022E95FC 0000005C .text FreeTopScreen (overlay_29_022E37DC.o) 022E9654 00000000 .text $d (overlay_29_022E37DC.o) 022E9658 00000000 .text $a (overlay_29_022E37DC.o) 022E9658 00000040 .text ov29_022E8CA8 (overlay_29_022E37DC.o) @@ -37420,7 +37420,7 @@ 02339250 00000000 .text $d (overlay_29_02337CCC.o) 02339254 0000002C .text IsSecretFloor (overlay_29_02337CCC.o) 02339254 00000000 .text $a (overlay_29_02337CCC.o) - 02339280 00000028 .text ov29_023386B0 (overlay_29_02337CCC.o) + 02339280 00000028 .text GetCurrentHiddenStairsType (overlay_29_02337CCC.o) 023392A8 00000030 .text HiddenStairsPresent (overlay_29_02337CCC.o) 023392D4 00000000 .text $d (overlay_29_02337CCC.o) 023392D8 00000034 .text ov29_02338708 (overlay_29_02337CCC.o) @@ -37928,9 +37928,9 @@ 02348EAC 00000000 .text $d (overlay_29_02347BC8.o) 02348EB0 00000000 .text $a (overlay_29_02347BC8.o) 02348EB0 00000024 .text ExclusiveItemEffectIsActive__023482B0 (overlay_29_02347BC8.o) - 02348ED4 00000038 .text ov29_023482D4 (overlay_29_02347BC8.o) + 02348ED4 00000038 .text DisplayFloorCard (overlay_29_02347BC8.o) 02348F08 00000000 .text $d (overlay_29_02347BC8.o) - 02348F0C 00000194 .text ov29_0234830C (overlay_29_02347BC8.o) + 02348F0C 00000194 .text HandleFloorCard (overlay_29_02347BC8.o) 02348F0C 00000000 .text $a (overlay_29_02347BC8.o) 02349098 00000000 .text $d (overlay_29_02347BC8.o) 023490A0 0000036C .text ov29_023484A0 (overlay_29_02347BC8.o) @@ -38276,7 +38276,7 @@ 0234CEF4 00000060 .text ov29_0234C2F4 (overlay_29_023498A0.o) 0234CF54 0000004C .text ov29_0234C354 (overlay_29_023498A0.o) 0234CFA0 00000068 .text ov29_0234C3A0 (overlay_29_023498A0.o) - 0234D008 000000F0 .text ov29_0234C408 (overlay_29_023498A0.o) + 0234D008 000000F0 .text StartFadeDungeon (overlay_29_023498A0.o) 0234D0F8 0000004C .text ov29_0234C4F8 (overlay_29_023498A0.o) 0234D140 00000000 .text $d (overlay_29_023498A0.o) 0234D144 00000000 .text $a (overlay_29_023498A0.o) @@ -38291,7 +38291,7 @@ 0234D254 00000014 .text ov29_0234C654 (overlay_29_023498A0.o) 0234D254 00000000 .text $a (overlay_29_023498A0.o) 0234D264 00000000 .text $d (overlay_29_023498A0.o) - 0234D268 000000A4 .text ov29_0234C668 (overlay_29_023498A0.o) + 0234D268 000000A4 .text StartFadeDungeonWrapper (overlay_29_023498A0.o) 0234D268 00000000 .text $a (overlay_29_023498A0.o) 0234D308 00000000 .text $d (overlay_29_023498A0.o) 0234D30C 0000002C .text ov29_0234C70C (overlay_29_023498A0.o) @@ -38300,10 +38300,10 @@ 0234D338 0000009C .text ov29_0234C738 (overlay_29_023498A0.o) 0234D338 00000000 .text $a (overlay_29_023498A0.o) 0234D3D0 00000000 .text $d (overlay_29_023498A0.o) - 0234D3D4 00000210 .text ov29_0234C7D4 (overlay_29_023498A0.o) + 0234D3D4 00000210 .text HandleFadesDungeon (overlay_29_023498A0.o) 0234D3D4 00000000 .text $a (overlay_29_023498A0.o) 0234D5E0 00000000 .text $d (overlay_29_023498A0.o) - 0234D5E4 00000018 .text ov29_0234C9E4 (overlay_29_023498A0.o) + 0234D5E4 00000018 .text HandleFadesDungeonBothScreens (overlay_29_023498A0.o) 0234D5E4 00000000 .text $a (overlay_29_023498A0.o) 0234D5FC 00000030 .text ov29_0234C9FC (overlay_29_023498A0.o) 0234D628 00000000 .text $d (overlay_29_023498A0.o) @@ -38956,7 +38956,7 @@ 02354140 00000000 .data ov29_02353540 (overlay_29_0234EC38.o) 02354144 00000000 .data ov29_02353544 (overlay_29_0234EC38.o) 0235414C 00000000 .data ov29_0235354C (overlay_29_0234EC38.o) - 02354154 00000000 .data ov29_02353554 (overlay_29_0234EC38.o) + 02354154 00000000 .data TOP_SCREEN_STATUS_PTR (overlay_29_0234EC38.o) 02354158 00000000 .data ov29_02353558 (overlay_29_0234EC38.o) 0235415C 00000000 .data LEADER_PTR (overlay_29_0234EC38.o) 02354160 00000000 .data ov29_02353560 (overlay_29_0234EC38.o) @@ -38998,7 +38998,7 @@ 023543E0 00000000 .data ov29_023537C8 (overlay_29_0234EC38.o) 023543E4 00000000 .data ov29_023537CC (overlay_29_0234EC38.o) 023543F0 00000000 .data ov29_023537D8 (overlay_29_0234EC38.o) - 023543F8 00000000 .data ov29_023537E0 (overlay_29_0234EC38.o) + 023543F8 00000000 .data DUNGEON_FADES_PTR (overlay_29_0234EC38.o) 023543FC 00000000 .data ov29_023537E4 (overlay_29_0234EC38.o) 02354400 00000000 .data ov29_023537E8 (overlay_29_0234EC38.o) 0235444C 00000000 .data ov29_02353834 (overlay_29_0234EC38.o) @@ -39264,7 +39264,7 @@ 02383420 00000000 .text $a (overlay_31.o) 0238345C 00000000 .text $d (overlay_31.o) 02383464 00000000 .text $a (overlay_31.o) - 02383464 0000025C .text ov31_02382864 (overlay_31.o) + 02383464 0000025C .text DrawDungeonMenuStatusWindow (overlay_31.o) 023836A0 00000000 .text $d (overlay_31.o) 023836C0 00000094 .text DungeonMenuSwitch (overlay_31.o) 023836C0 00000000 .text $a (overlay_31.o) @@ -39872,5 +39872,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Dec 10 19:14:00 2023 -# Link end time: Sun Dec 10 19:14:01 2023 +# Link start time: Wed Dec 20 03:34:38 2023 +# Link end time: Wed Dec 20 03:34:39 2023 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index 1d4f67d1..5d6680db 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -1252,10 +1252,10 @@ 0200B924 00000000 .text $d (main_02000C6C.o) 0200B928 00000000 .text $a (main_02000C6C.o) 0200B928 00000068 .text sub_0200B928 (main_02000C6C.o) - 0200B990 00000078 .text sub_0200B990 (main_02000C6C.o) + 0200B990 00000078 .text UpdateFadeStatus (main_02000C6C.o) 0200BA00 00000000 .text $d (main_02000C6C.o) 0200BA08 00000000 .text $a (main_02000C6C.o) - 0200BA08 00000158 .text sub_0200BA08 (main_02000C6C.o) + 0200BA08 00000158 .text HandleFades (main_02000C6C.o) 0200BB60 00000014 .text sub_0200BB60 (main_02000C6C.o) 0200BB70 00000000 .text $d (main_02000C6C.o) 0200BB74 00000000 .text $a (main_02000C6C.o) @@ -1270,7 +1270,7 @@ 0200BC60 00000050 .text sub_0200BC60 (main_02000C6C.o) 0200BCB0 00000064 .text sub_0200BCB0 (main_02000C6C.o) 0200BD14 00000018 .text sub_0200BD14 (main_02000C6C.o) - 0200BD2C 00000024 .text sub_0200BD2C (main_02000C6C.o) + 0200BD2C 00000024 .text GetFadeStatus (main_02000C6C.o) 0200BD50 000002B8 .text sub_0200BD50 (main_02000C6C.o) 0200C008 00000018 .text sub_0200C008 (main_02000C6C.o) 0200C01C 00000000 .text $d (main_02000C6C.o) @@ -3266,7 +3266,7 @@ 02026204 00000010 .text sub_02026204 (main_0200C4CC.o) 02026210 00000000 .text $d (main_0200C4CC.o) 02026214 00000000 .text $a (main_0200C4CC.o) - 02026214 00000054 .text sub_02026214 (main_0200C4CC.o) + 02026214 00000054 .text DrawTextInWindow (main_0200C4CC.o) 02026264 00000000 .text $d (main_0200C4CC.o) 02026268 00000000 .text $a (main_0200C4CC.o) 02026268 00000078 .text sub_02026268 (main_0200C4CC.o) @@ -3384,7 +3384,7 @@ 02027B1C 00000000 .text $a (main_0200C4CC.o) 02027B50 00000000 .text $d (main_0200C4CC.o) 02027B58 00000000 .text $a (main_0200C4CC.o) - 02027B58 00000030 .text sub_02027B58 (main_0200C4CC.o) + 02027B58 00000030 .text ClearWindow (main_0200C4CC.o) 02027B7C 00000000 .text $d (main_0200C4CC.o) 02027B88 000002A8 .text sub_02027B88 (main_0200C4CC.o) 02027B88 00000000 .text $a (main_0200C4CC.o) @@ -5827,11 +5827,11 @@ 02050D84 00000084 .text sub_02050D84 (main_0200C4CC.o) 02050DFC 00000000 .text $d (main_0200C4CC.o) 02050E08 00000000 .text $a (main_0200C4CC.o) - 02050E08 00000010 .text sub_02050E08 (main_0200C4CC.o) - 02050E18 0000003C .text sub_02050E18 (main_0200C4CC.o) + 02050E08 00000010 .text ResetPlayTimer (main_0200C4CC.o) + 02050E18 0000003C .text PlayTimerTick (main_0200C4CC.o) 02050E50 00000000 .text $d (main_0200C4CC.o) 02050E54 00000000 .text $a (main_0200C4CC.o) - 02050E54 00000008 .text sub_02050E54 (main_0200C4CC.o) + 02050E54 00000008 .text GetPlayTimeSeconds (main_0200C4CC.o) 02050E5C 00000030 .text sub_02050E5C (main_0200C4CC.o) 02050E8C 00000030 .text sub_02050E8C (main_0200C4CC.o) 02050EBC 00000054 .text sub_02050EBC (main_0200C4CC.o) @@ -19003,7 +19003,7 @@ 02332ACC 00000428 .text ov01_02332ACC (overlay_01.o) 02332ACC 00000000 .text $a (overlay_01.o) 02332EDC 00000000 .text $d (overlay_01.o) - 02332EF4 00000784 .text ov01_02332EF4 (overlay_01.o) + 02332EF4 00000784 .text ProcessContinueScreenContents (overlay_01.o) 02332EF4 00000000 .text $a (overlay_01.o) 0233361C 00000000 .text $d (overlay_01.o) 02333678 00000028 .text ov01_02333678 (overlay_01.o) @@ -25683,10 +25683,10 @@ 022C0998 00000050 .text ov10_022C0998 (overlay_10.o) 022C0998 00000000 .text $a (overlay_10.o) 022C09E4 00000000 .text $d (overlay_10.o) - 022C09E8 000002F8 .text ov10_022C09E8 (overlay_10.o) + 022C09E8 000002F8 .text DrawTeamStats (overlay_10.o) 022C09E8 00000000 .text $a (overlay_10.o) 022C0CC0 00000000 .text $d (overlay_10.o) - 022C0CE0 0000028C .text ov10_022C0CE0 (overlay_10.o) + 022C0CE0 0000028C .text UpdateTeamStats (overlay_10.o) 022C0CE0 00000000 .text $a (overlay_10.o) 022C0F5C 00000000 .text $d (overlay_10.o) 022C0F6C 0000026C .text ov10_022C0F6C (overlay_10.o) @@ -25698,7 +25698,7 @@ 022C1398 0000001C .text ov10_022C1398 (overlay_10.o) 022C1398 00000000 .text $a (overlay_10.o) 022C13AC 00000000 .text $d (overlay_10.o) - 022C13B4 0000011C .text ov10_022C13B4 (overlay_10.o) + 022C13B4 0000011C .text FreeTeamStats (overlay_10.o) 022C13B4 00000000 .text $a (overlay_10.o) 022C14C8 00000000 .text $d (overlay_10.o) 022C14D0 000000CC .text ov10_022C14D0 (overlay_10.o) @@ -25707,7 +25707,7 @@ 022C159C 0000013C .text ov10_022C159C (overlay_10.o) 022C159C 00000000 .text $a (overlay_10.o) 022C16CC 00000000 .text $d (overlay_10.o) - 022C16D8 00000070 .text ov10_022C16D8 (overlay_10.o) + 022C16D8 00000070 .text FreeMapAndTeam (overlay_10.o) 022C16D8 00000000 .text $a (overlay_10.o) 022C1744 00000000 .text $d (overlay_10.o) 022C1748 000000F4 .text ProcessTeamStatsLvHp (overlay_10.o) @@ -26770,7 +26770,7 @@ 022E9F48 00000000 .text $a (overlay_11.o) 022E9F48 00000030 .text ov11_022E9F48 (overlay_11.o) 022E9F70 00000000 .text $d (overlay_11.o) - 022E9F78 0000002C .text ov11_022E9F78 (overlay_11.o) + 022E9F78 0000002C .text IsScreenFadeInProgress (overlay_11.o) 022E9F78 00000000 .text $a (overlay_11.o) 022E9F9C 00000000 .text $d (overlay_11.o) 022E9FA4 00000000 .text $a (overlay_11.o) @@ -28494,7 +28494,7 @@ 0230E610 00000000 .text $d (overlay_11.o) 0230E614 00000000 .text $a (overlay_11.o) 0230E614 00000004 .text ov11_0230E614 (overlay_11.o) - 0230E618 000001D4 .text ov11_0230E618 (overlay_11.o) + 0230E618 000001D4 .text HandleControlsTopScreenGround (overlay_11.o) 0230E7E8 00000000 .text $d (overlay_11.o) 0230E7EC 000000E4 .text ov11_0230E7EC (overlay_11.o) 0230E7EC 00000000 .text $a (overlay_11.o) @@ -28877,7 +28877,7 @@ 02313AD4 00000000 .text $d (overlay_11.o) 02313AD8 00000000 .text $a (overlay_11.o) 02313AD8 00000004 .text ov11_02313AD8 (overlay_11.o) - 02313ADC 000001D4 .text ov11_02313ADC (overlay_11.o) + 02313ADC 000001D4 .text HandleTeamStatsGround (overlay_11.o) 02313CAC 00000000 .text $d (overlay_11.o) 02313CB0 00000000 .text $a (overlay_11.o) 02313CB0 00000068 .text ov11_02313CB0 (overlay_11.o) @@ -33981,11 +33981,11 @@ 022E7E58 00000000 .text $a (overlay_29_022E37DC.o) 022E7E58 0000006C .text GetMonsterLevelToSpawn (overlay_29_022E37DC.o) 022E7EC0 00000000 .text $d (overlay_29_022E37DC.o) - 022E7EC4 00000080 .text ov29_022E7EC4 (overlay_29_022E37DC.o) + 022E7EC4 00000080 .text AllocTopScreenStatus (overlay_29_022E37DC.o) 022E7EC4 00000000 .text $a (overlay_29_022E37DC.o) 022E7F40 00000000 .text $d (overlay_29_022E37DC.o) 022E7F44 00000000 .text $a (overlay_29_022E37DC.o) - 022E7F44 00000038 .text ov29_022E7F44 (overlay_29_022E37DC.o) + 022E7F44 00000038 .text FreeTopScreenStatus (overlay_29_022E37DC.o) 022E7F78 00000000 .text $d (overlay_29_022E37DC.o) 022E7F7C 00000018 .text ov29_022E7F7C (overlay_29_022E37DC.o) 022E7F7C 00000000 .text $a (overlay_29_022E37DC.o) @@ -34005,15 +34005,15 @@ 022E8104 00000000 .text $a (overlay_29_022E37DC.o) 022E8104 0000002C .text ov29_022E8104 (overlay_29_022E37DC.o) 022E812C 00000000 .text $d (overlay_29_022E37DC.o) - 022E8130 00000060 .text ov29_022E8130 (overlay_29_022E37DC.o) + 022E8130 00000060 .text InitializeTeamStats (overlay_29_022E37DC.o) 022E8130 00000000 .text $a (overlay_29_022E37DC.o) 022E818C 00000000 .text $d (overlay_29_022E37DC.o) 022E8190 00000000 .text $a (overlay_29_022E37DC.o) - 022E8190 00000038 .text ov29_022E8190 (overlay_29_022E37DC.o) + 022E8190 00000038 .text UpdateTeamStatsWrapper (overlay_29_022E37DC.o) 022E81C4 00000000 .text $d (overlay_29_022E37DC.o) 022E81C8 00000020 .text ov29_022E81C8 (overlay_29_022E37DC.o) 022E81C8 00000000 .text $a (overlay_29_022E37DC.o) - 022E81E8 00000010 .text ov29_022E81E8 (overlay_29_022E37DC.o) + 022E81E8 00000010 .text FreeTeamStatsWrapper (overlay_29_022E37DC.o) 022E81F8 0000004C .text ov29_022E81F8 (overlay_29_022E37DC.o) 022E8240 00000000 .text $d (overlay_29_022E37DC.o) 022E8244 00000000 .text $a (overlay_29_022E37DC.o) @@ -34058,7 +34058,7 @@ 022E86A8 00000020 .text ov29_022E86A8 (overlay_29_022E37DC.o) 022E86C4 00000000 .text $d (overlay_29_022E37DC.o) 022E86C8 00000000 .text $a (overlay_29_022E37DC.o) - 022E86C8 0000001C .text ov29_022E86C8 (overlay_29_022E37DC.o) + 022E86C8 0000001C .text AssignTopScreenHandlers (overlay_29_022E37DC.o) 022E86E4 00000024 .text ov29_022E86E4 (overlay_29_022E37DC.o) 022E8704 00000000 .text $d (overlay_29_022E37DC.o) 022E8708 00000000 .text $a (overlay_29_022E37DC.o) @@ -34087,7 +34087,7 @@ 022E8848 00000024 .text ov29_022E8848 (overlay_29_022E37DC.o) 022E8868 00000000 .text $d (overlay_29_022E37DC.o) 022E886C 00000000 .text $a (overlay_29_022E37DC.o) - 022E886C 00000390 .text ov29_022E886C (overlay_29_022E37DC.o) + 022E886C 00000390 .text HandleTopScreenFades (overlay_29_022E37DC.o) 022E8BA0 00000000 .text $d (overlay_29_022E37DC.o) 022E8BFC 00000000 .text $a (overlay_29_022E37DC.o) 022E8BFC 00000014 .text ov29_022E8BFC (overlay_29_022E37DC.o) @@ -34096,7 +34096,7 @@ 022E8C10 0000003C .text ov29_022E8C10 (overlay_29_022E37DC.o) 022E8C48 00000000 .text $d (overlay_29_022E37DC.o) 022E8C4C 00000000 .text $a (overlay_29_022E37DC.o) - 022E8C4C 0000005C .text ov29_022E8C4C (overlay_29_022E37DC.o) + 022E8C4C 0000005C .text FreeTopScreen (overlay_29_022E37DC.o) 022E8CA4 00000000 .text $d (overlay_29_022E37DC.o) 022E8CA8 00000000 .text $a (overlay_29_022E37DC.o) 022E8CA8 00000040 .text ov29_022E8CA8 (overlay_29_022E37DC.o) @@ -37382,7 +37382,7 @@ 02338680 00000000 .text $d (overlay_29_02337CCC.o) 02338684 00000000 .text $a (overlay_29_02337CCC.o) 02338684 0000002C .text IsSecretFloor (overlay_29_02337CCC.o) - 023386B0 00000028 .text ov29_023386B0 (overlay_29_02337CCC.o) + 023386B0 00000028 .text GetCurrentHiddenStairsType (overlay_29_02337CCC.o) 023386D8 00000030 .text HiddenStairsPresent (overlay_29_02337CCC.o) 02338704 00000000 .text $d (overlay_29_02337CCC.o) 02338708 00000000 .text $a (overlay_29_02337CCC.o) @@ -37889,9 +37889,9 @@ 023482AC 00000000 .text $d (overlay_29_02347BC8.o) 023482B0 00000000 .text $a (overlay_29_02347BC8.o) 023482B0 00000024 .text ExclusiveItemEffectIsActive__023482B0 (overlay_29_02347BC8.o) - 023482D4 00000038 .text ov29_023482D4 (overlay_29_02347BC8.o) + 023482D4 00000038 .text DisplayFloorCard (overlay_29_02347BC8.o) 02348308 00000000 .text $d (overlay_29_02347BC8.o) - 0234830C 00000194 .text ov29_0234830C (overlay_29_02347BC8.o) + 0234830C 00000194 .text HandleFloorCard (overlay_29_02347BC8.o) 0234830C 00000000 .text $a (overlay_29_02347BC8.o) 02348498 00000000 .text $d (overlay_29_02347BC8.o) 023484A0 0000036C .text ov29_023484A0 (overlay_29_02347BC8.o) @@ -38237,7 +38237,7 @@ 0234C2F4 00000060 .text ov29_0234C2F4 (overlay_29_023498A0.o) 0234C354 0000004C .text ov29_0234C354 (overlay_29_023498A0.o) 0234C3A0 00000068 .text ov29_0234C3A0 (overlay_29_023498A0.o) - 0234C408 000000F0 .text ov29_0234C408 (overlay_29_023498A0.o) + 0234C408 000000F0 .text StartFadeDungeon (overlay_29_023498A0.o) 0234C4F8 0000004C .text ov29_0234C4F8 (overlay_29_023498A0.o) 0234C540 00000000 .text $d (overlay_29_023498A0.o) 0234C544 00000000 .text $a (overlay_29_023498A0.o) @@ -38252,7 +38252,7 @@ 0234C654 00000014 .text ov29_0234C654 (overlay_29_023498A0.o) 0234C654 00000000 .text $a (overlay_29_023498A0.o) 0234C664 00000000 .text $d (overlay_29_023498A0.o) - 0234C668 000000A4 .text ov29_0234C668 (overlay_29_023498A0.o) + 0234C668 000000A4 .text StartFadeDungeonWrapper (overlay_29_023498A0.o) 0234C668 00000000 .text $a (overlay_29_023498A0.o) 0234C708 00000000 .text $d (overlay_29_023498A0.o) 0234C70C 0000002C .text ov29_0234C70C (overlay_29_023498A0.o) @@ -38261,10 +38261,10 @@ 0234C738 0000009C .text ov29_0234C738 (overlay_29_023498A0.o) 0234C738 00000000 .text $a (overlay_29_023498A0.o) 0234C7D0 00000000 .text $d (overlay_29_023498A0.o) - 0234C7D4 00000210 .text ov29_0234C7D4 (overlay_29_023498A0.o) + 0234C7D4 00000210 .text HandleFadesDungeon (overlay_29_023498A0.o) 0234C7D4 00000000 .text $a (overlay_29_023498A0.o) 0234C9E0 00000000 .text $d (overlay_29_023498A0.o) - 0234C9E4 00000018 .text ov29_0234C9E4 (overlay_29_023498A0.o) + 0234C9E4 00000018 .text HandleFadesDungeonBothScreens (overlay_29_023498A0.o) 0234C9E4 00000000 .text $a (overlay_29_023498A0.o) 0234C9FC 00000030 .text ov29_0234C9FC (overlay_29_023498A0.o) 0234CA28 00000000 .text $d (overlay_29_023498A0.o) @@ -38917,7 +38917,7 @@ 02353540 00000000 .data ov29_02353540 (overlay_29_0234EC38.o) 02353544 00000000 .data ov29_02353544 (overlay_29_0234EC38.o) 0235354C 00000000 .data ov29_0235354C (overlay_29_0234EC38.o) - 02353554 00000000 .data ov29_02353554 (overlay_29_0234EC38.o) + 02353554 00000000 .data TOP_SCREEN_STATUS_PTR (overlay_29_0234EC38.o) 02353558 00000000 .data ov29_02353558 (overlay_29_0234EC38.o) 0235355C 00000000 .data LEADER_PTR (overlay_29_0234EC38.o) 02353560 00000000 .data ov29_02353560 (overlay_29_0234EC38.o) @@ -38959,7 +38959,7 @@ 023537C8 00000000 .data ov29_023537C8 (overlay_29_0234EC38.o) 023537CC 00000000 .data ov29_023537CC (overlay_29_0234EC38.o) 023537D8 00000000 .data ov29_023537D8 (overlay_29_0234EC38.o) - 023537E0 00000000 .data ov29_023537E0 (overlay_29_0234EC38.o) + 023537E0 00000000 .data DUNGEON_FADES_PTR (overlay_29_0234EC38.o) 023537E4 00000000 .data ov29_023537E4 (overlay_29_0234EC38.o) 023537E8 00000000 .data ov29_023537E8 (overlay_29_0234EC38.o) 02353834 00000000 .data ov29_02353834 (overlay_29_0234EC38.o) @@ -39226,7 +39226,7 @@ 02382820 00000000 .text $a (overlay_31.o) 0238285C 00000000 .text $d (overlay_31.o) 02382864 00000000 .text $a (overlay_31.o) - 02382864 0000025C .text ov31_02382864 (overlay_31.o) + 02382864 0000025C .text DrawDungeonMenuStatusWindow (overlay_31.o) 02382AA0 00000000 .text $d (overlay_31.o) 02382AC0 00000094 .text DungeonMenuSwitch (overlay_31.o) 02382AC0 00000000 .text $a (overlay_31.o) @@ -39838,5 +39838,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Sun Dec 10 19:13:19 2023 -# Link end time: Sun Dec 10 19:13:19 2023 +# Link start time: Wed Dec 20 03:33:56 2023 +# Link end time: Wed Dec 20 03:33:57 2023