Synced from pmdsky-debug

This commit is contained in:
AnonymousRandomPerson 2024-01-18 10:47:13 -05:00
parent eeb2526a41
commit ce50f1612d
18 changed files with 298 additions and 298 deletions

View File

@ -109,7 +109,6 @@
.public _020AFC70
.public _020B0A4C
.public _020B0A54
.public _020B0A60
.public _020B0AD8
.public _020B0AFC
.public _020B0B04
@ -299,6 +298,7 @@
.public IsMovesetValid
.public IsMovesetValidInTimeDarkness
.public IsSkyExclusiveDungeon
.public IsSpecialEpisodeOpen
.public IsStorableItem
.public IsThrownItem
.public IsUnown
@ -339,6 +339,7 @@
.public MemZero
.public MISSION_BANNED_MONSTERS
.public MISSION_BANNED_STORY_MONSTERS
.public MISSION_DELIVER_LIST_PTR
.public MISSION_DUNGEON_UNLOCK_TABLE
.public MISSION_MENU_STRING_IDS_1
.public MISSION_MENU_STRING_IDS_2
@ -394,6 +395,7 @@
.public SetPokemonJoined
.public SetQuestionMarks
.public SetScenarioScriptVar
.public SetSpecialEpisodeType
.public SetSpriteIdForAnimationControl
.public ShowPortraitInPortraitBox
.public ShuffleHiddenPower
@ -539,9 +541,7 @@
.public sub_0204AF98
.public sub_0204B018
.public sub_0204C6C8
.public sub_0204C900
.public sub_0204C918
.public sub_0204C94C
.public sub_0204C978
.public sub_0204CA1C
.public sub_0204D018

View File

@ -85,6 +85,7 @@
.public IsMovesetValid
.public IsParentMenuActive
.public IsSimpleMenuActive
.public IsSpecialEpisodeOpen
.public IsTextBoxActive
.public LoadScriptVariableValueAtIndex
.public LoadWanTableEntry
@ -231,6 +232,8 @@
.public PreprocessStringFromId
.public PrintClearMark
.public RandInt
.public ResumeAdvancedMenu
.public ResumeParentMenu
.public SetAdvancedTextBoxState5
.public SetAnimationForAnimationControl
.public SetIrqFlag
@ -285,11 +288,9 @@
.public sub_02029FBC
.public sub_0202A2A4
.public sub_0202A40C
.public sub_0202A954
.public sub_0202AB80
.public sub_0202ABB0
.public sub_0202B0A4
.public sub_0202BBF0
.public sub_0202BC28
.public sub_0202BC60
.public sub_0202BD48
@ -330,7 +331,6 @@
.public sub_0204AE60
.public sub_0204C918
.public sub_0204C928
.public sub_0204C94C
.public sub_0204C9A0
.public sub_0204C9C8
.public sub_0204CA1C

View File

@ -71,6 +71,7 @@
.public ov01_023398B0
.public ov01_02339988
.public PreprocessString
.public ResumeAdvancedMenu
.public StrncpySimpleNoPadSafe
.public sub_02003B94
.public sub_02003BC8
@ -79,7 +80,6 @@
.public sub_0202836C
.public sub_02029F88
.public sub_02029FBC
.public sub_0202BBF0
.public sub_02046A20
.public sub_02046A9C
.public sub_02046B04

View File

@ -1,5 +1,9 @@
#pragma once
.public AddMissionToJobList
.public AlreadyHaveMission
.public CanSendItem
.public CountJobListMissions
.public CreateJobSummary
.public Debug_Print0
.public DungeonRequestsDoneWrapper
.public GetAdventureLogDungeonFloor
@ -9,6 +13,9 @@
.public GetLanguageType
.public GetMainTeamNameWithCheck
.public GetReleasedStylus
.public IsMissionSuspendedAndValid
.public IsMissionTypeSpecialEpisode
.public IsSpecialEpisodeOpen
.public MemAlloc
.public MemcpySimple
.public MemFree
@ -64,19 +71,12 @@
.public sub_0204A018
.public sub_0204A1CC
.public sub_0204AE60
.public sub_0204C94C
.public sub_0204C978
.public sub_0204DD80
.public sub_0204E210
.public sub_02050974
.public sub_020509BC
.public sub_0205B440
.public sub_0205C854
.public sub_0205D1F4
.public sub_0205E238
.public sub_0205EC98
.public sub_0205ED84
.public sub_0205F0B8
.public sub_0205F5A8
.public sub_0205F710
.public sub_0205FA38
@ -86,9 +86,9 @@
.public sub_02066A44
.public sub_020674CC
.public sub_02067664
.public sub_02069800
.public sub_020698B8
.public sub_02069904
.public sub_02069D40
.public sub_02069D94
.public sub_02069DC0
.public WonderMailPasswordToMission

View File

@ -9,6 +9,7 @@
.public abs
.public AddBulkItemToStorage
.public AddItemToBagNoHeld
.public AddMissionToJobList
.public AnimationControlGetAllocForMaxFrame
.public AnyDungeonRequestsDone
.public ApplyGummiBoostsToGroundMonster
@ -45,6 +46,7 @@
.public CreateCollectionMenu
.public CreateControlsChart
.public CreateDialogueBox
.public CreateJobSummary
.public CreateMemArena
.public CreateMonsterSummaryFromTeamMember
.public CreateParentMenu
@ -103,6 +105,7 @@
.public GetExecuteSpecialEpisodeType
.public GetFadeStatus
.public GetFirstEmptyMemberIdx
.public GetFirstMatchingMemberIdx
.public GetFirstUnequippedItemOfType
.public GetGameMode
.public GetHeldButtons
@ -325,6 +328,8 @@
.public RemoveItemNoHole
.public RemoveItemNoHoleCheck
.public Render3dElement64
.public ResumeAdvancedMenu
.public ResumeParentMenu
.public SaveScriptVariableValue
.public SaveScriptVariableValueAtIndex
.public SaveScriptVariableValueBytes
@ -535,11 +540,9 @@
.public sub_02028E88
.public sub_0202A03C
.public sub_0202A434
.public sub_0202A954
.public sub_0202AB80
.public sub_0202ABB0
.public sub_0202B030
.public sub_0202BBF0
.public sub_0202C620
.public sub_0202C748
.public sub_0202C75C
@ -700,7 +703,6 @@
.public sub_02055474
.public sub_020555D0
.public sub_02055894
.public sub_020558F4
.public sub_02055B20
.public sub_02055CCC
.public sub_02055D4C
@ -733,7 +735,6 @@
.public sub_0205EC38
.public sub_0205EC50
.public sub_0205EC78
.public sub_0205F0B8
.public sub_0205F0F0
.public sub_0205F118
.public sub_0205F2B8
@ -777,7 +778,6 @@
.public sub_02067584
.public sub_02067664
.public sub_020676AC
.public sub_02069800
.public sub_020698B8
.public sub_02069904
.public sub_0206A84C

View File

@ -40,6 +40,7 @@
.public PortraitBoxNeedsUpdate
.public PreprocessString
.public PrintIqSkillsMenu
.public ResumeAdvancedMenu
.public SetAdvancedTextBoxState5
.public SetPortraitEmotion
.public SetPortraitLayout
@ -52,7 +53,6 @@
.public sub_02017C80
.public sub_02026268
.public sub_02027B1C
.public sub_0202BBF0
.public sub_0202BC60
.public sub_0202C1E4
.public sub_0202F334

View File

@ -41,6 +41,7 @@
.public PlaySeVolumeWrapper
.public PreprocessStringFromId
.public Rand16Bit
.public ResumeSimpleMenu
.public SetCollectionMenuField0x1A0
.public SetCollectionMenuField0x1A4
.public SetCollectionMenuField0x1C8
@ -79,7 +80,6 @@
.public sub_02025D50
.public sub_02027B1C
.public sub_0202A03C
.public sub_0202B490
.public sub_0202B530
.public sub_0202B544
.public sub_0202B568

View File

@ -169,6 +169,7 @@
.public PreprocessString
.public PreprocessStringFromId
.public PrintIqSkillsMenu
.public ResumeParentMenu
.public SetAdvancedTextBoxField0x1C2
.public SetAdvancedTextBoxField0x1C4
.public SetAdvancedTextBoxState5
@ -192,7 +193,6 @@
.public sub_0202812C
.public sub_020282F4
.public sub_02028354
.public sub_0202A954
.public sub_0202A98C
.public sub_0202AB80
.public sub_0202AB94

View File

@ -38705,8 +38705,8 @@ _0202A94C: .word UpdateParentMenu
_0202A950: .word PARENT_MENU_DEFAULT_WINDOW_PARAMS
arm_func_end CreateParentMenuInternal
arm_func_start sub_0202A954
sub_0202A954: ; 0x0202A954
arm_func_start ResumeParentMenu
ResumeParentMenu: ; 0x0202A954
stmdb sp!, {r3, lr}
bl GetWindowContents
mov r1, #1
@ -38721,7 +38721,7 @@ sub_0202A954: ; 0x0202A954
add r0, r0, #4
bl sub_02032984
ldmia sp!, {r3, pc}
arm_func_end sub_0202A954
arm_func_end ResumeParentMenu
arm_func_start sub_0202A98C
sub_0202A98C: ; 0x0202A98C
@ -39554,8 +39554,8 @@ _0202B488: .word UpdateSimpleMenu
_0202B48C: .word SIMPLE_MENU_DEFAULT_WINDOW_PARAMS
arm_func_end CreateSimpleMenuInternal
arm_func_start sub_0202B490
sub_0202B490: ; 0x0202B490
arm_func_start ResumeSimpleMenu
ResumeSimpleMenu: ; 0x0202B490
stmdb sp!, {r3, lr}
bl GetWindowContents
mov r1, #1
@ -39569,7 +39569,7 @@ sub_0202B490: ; 0x0202B490
add r0, r0, #4
bl sub_02032984
ldmia sp!, {r3, pc}
arm_func_end sub_0202B490
arm_func_end ResumeSimpleMenu
arm_func_start CloseSimpleMenu
CloseSimpleMenu: ; 0x0202B4C4
@ -40116,8 +40116,8 @@ _0202BBE8: .word ADVANCED_MENU_DEFAULT_WINDOW_PARAMS
_0202BBEC: .word UpdateAdvancedMenu
arm_func_end CreateAdvancedMenu
arm_func_start sub_0202BBF0
sub_0202BBF0: ; 0x0202BBF0
arm_func_start ResumeAdvancedMenu
ResumeAdvancedMenu: ; 0x0202BBF0
stmdb sp!, {r3, lr}
bl GetWindowContents
mov r1, #1
@ -40132,7 +40132,7 @@ sub_0202BBF0: ; 0x0202BBF0
add r0, r0, #4
bl sub_02032984
ldmia sp!, {r3, pc}
arm_func_end sub_0202BBF0
arm_func_end ResumeAdvancedMenu
arm_func_start sub_0202BC28
sub_0202BC28: ; 0x0202BC28
@ -66605,7 +66605,7 @@ _02041DF0:
ldr r0, _020420BC ; =_020AFE90
ldr r0, [r0, #4]
ldrsb r0, [r0]
bl sub_0202BBF0
bl ResumeAdvancedMenu
ldr r0, _020420BC ; =_020AFE90
mov r1, #0
ldr r0, [r0, #4]
@ -66654,7 +66654,7 @@ _02041E98:
ldr r0, _020420BC ; =_020AFE90
ldr r0, [r0, #4]
ldrsb r0, [r0]
bl sub_0202BBF0
bl ResumeAdvancedMenu
ldr r0, _020420BC ; =_020AFE90
mov r1, #0
ldr r0, [r0, #4]
@ -79747,8 +79747,8 @@ GetSpecialEpisodeType: ; 0x0204C8EC
_0204C8FC: .word LoadScriptVariableValue
arm_func_end GetSpecialEpisodeType
arm_func_start sub_0204C900
sub_0204C900: ; 0x0204C900
arm_func_start SetSpecialEpisodeType
SetSpecialEpisodeType: ; 0x0204C900
ldr ip, _0204C914 ; =SaveScriptVariableValue
mov r2, r0
mov r0, #0
@ -79756,7 +79756,7 @@ sub_0204C900: ; 0x0204C900
bx ip
.align 2, 0
_0204C914: .word SaveScriptVariableValue
arm_func_end sub_0204C900
arm_func_end SetSpecialEpisodeType
arm_func_start sub_0204C918
sub_0204C918: ; 0x0204C918
@ -79786,8 +79786,8 @@ GetExecuteSpecialEpisodeType: ; 0x0204C938
_0204C948: .word LoadScriptVariableValue
arm_func_end GetExecuteSpecialEpisodeType
arm_func_start sub_0204C94C
sub_0204C94C: ; 0x0204C94C
arm_func_start IsSpecialEpisodeOpen
IsSpecialEpisodeOpen: ; 0x0204C94C
stmdb sp!, {r3, lr}
mov r0, r0, lsl #0x10
mov r2, r0, lsr #0x10
@ -79799,7 +79799,7 @@ sub_0204C94C: ; 0x0204C94C
moveq r0, #0
and r0, r0, #0xff
ldmia sp!, {r3, pc}
arm_func_end sub_0204C94C
arm_func_end IsSpecialEpisodeOpen
arm_func_start sub_0204C978
sub_0204C978: ; 0x0204C978
@ -81404,8 +81404,8 @@ _0204DD50:
_0204DD7C: .word ARM9_UNKNOWN_TABLE__NA_209E12C
arm_func_end sub_0204DCA0
arm_func_start sub_0204DD80
sub_0204DD80: ; 0x0204DD80
arm_func_start WonderMailPasswordToMission
WonderMailPasswordToMission: ; 0x0204DD80
stmdb sp!, {r4, r5, lr}
sub sp, sp, #0x6c
mov r2, r0
@ -81475,7 +81475,7 @@ _0204DE6C:
.align 2, 0
_0204DE74: .word WONDER_MAIL_BITS_SWAP
_0204DE78: .word _0209E264
arm_func_end sub_0204DD80
arm_func_end WonderMailPasswordToMission
arm_func_start sub_0204DE7C
sub_0204DE7C: ; 0x0204DE7C

File diff suppressed because it is too large Load Diff

View File

@ -53475,8 +53475,8 @@ _020B0A54:
.global _020B0A5C
_020B0A5C:
.byte 0x00, 0x00, 0x00, 0x00
.global _020B0A60
_020B0A60:
.global MISSION_DELIVER_LIST_PTR
MISSION_DELIVER_LIST_PTR:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

View File

@ -9609,7 +9609,7 @@ CreateMainMenus: ; 0x023310E4
str r6, [r0, #0x114]
_0233111C:
mov r0, r6
bl sub_0204C94C
bl IsSpecialEpisodeOpen
cmp r0, #0
beq _02331180
ldr r2, [r7]
@ -10295,7 +10295,7 @@ _02331A78:
strb r0, [r1]
b _02331AA0
_02331A9C:
bl sub_0202A954
bl ResumeParentMenu
_02331AA0:
ldr r0, _02332508 ; =ov01_0233C178
mov r1, #3
@ -13644,7 +13644,7 @@ _023348F8:
ldr r0, _02334B90 ; =ov01_0233C1A0
ldr r0, [r0, #4]
ldrsb r0, [r0]
bl sub_0202BBF0
bl ResumeAdvancedMenu
b _023349B4
_0233491C:
mov r0, #1
@ -13659,7 +13659,7 @@ _0233491C:
ldr r0, _02334B90 ; =ov01_0233C1A0
ldr r0, [r0, #4]
ldrsb r0, [r0]
bl sub_0202BBF0
bl ResumeAdvancedMenu
b _023349B4
_02334954:
ldr r0, _02334B90 ; =ov01_0233C1A0
@ -13681,7 +13681,7 @@ _02334954:
ldr r0, _02334B90 ; =ov01_0233C1A0
ldr r0, [r0, #4]
ldrsb r0, [r0]
bl sub_0202BBF0
bl ResumeAdvancedMenu
b _023349B4
_023349A8:
mov r0, #4

View File

@ -2213,7 +2213,7 @@ _0233E7F4:
strb r0, [r1, #0x7dc]
b _0233E878
_0233E874:
bl sub_0202BBF0
bl ResumeAdvancedMenu
_0233E878:
ldr r0, _0233EB00 ; =ov05_0233FCA8
ldr r1, _0233EB04 ; =0x00003023

View File

@ -481,23 +481,23 @@ _0233D004:
ldr r4, [r0]
add r0, r4, #0x44
add r1, r4, #0x20
bl sub_0204DD80
bl WonderMailPasswordToMission
cmp r0, #0
moveq r4, #2
beq _0233D110
add r0, r4, #0x20
bl sub_0205E238
bl IsMissionTypeSpecialEpisode
cmp r0, #0
beq _0233D070
mov r0, #2
bl sub_0204C94C
bl IsSpecialEpisodeOpen
cmp r0, #0
movne r4, #5
moveq r4, #1
b _0233D110
_0233D070:
add r0, r4, #0x20
bl sub_0205C854
bl IsMissionSuspendedAndValid
cmp r0, #0
moveq r4, #3
beq _0233D110
@ -526,7 +526,7 @@ _0233D0C0:
beq _0233D110
_0233D0D8:
add r0, r4, #0x20
bl sub_0205EC98
bl AlreadyHaveMission
cmp r0, #0
movne r4, #4
bne _0233D110
@ -535,7 +535,7 @@ _0233D0D8:
cmp r0, #0
movne r4, #4
bne _0233D110
bl sub_0205ED84
bl CountJobListMissions
cmp r0, #8
movge r4, #6
movlt r4, #0
@ -584,14 +584,14 @@ _0233D184:
mov r1, #0
ldr r0, [r0]
add r0, r0, #0x20
bl sub_02069800
bl CreateJobSummary
ldr r0, _0233D4CC ; =ov06_0233EEC4
mov r2, #0x324
ldr r1, [r0]
str r2, [r1]
ldr r0, [r0]
add r0, r0, #0x20
bl sub_0205F0B8
bl AddMissionToJobList
bl sub_0205F5A8
bl sub_0205F710
b _0233D4C4
@ -611,7 +611,7 @@ _0233D1CC:
mov r1, #0
ldr r0, [r0]
add r0, r0, #0x20
bl sub_02069800
bl CreateJobSummary
ldr r0, _0233D4CC ; =ov06_0233EEC4
mov r1, #0x324
ldr r0, [r0]
@ -788,7 +788,7 @@ _0233D454:
ldr r0, _0233D4CC ; =ov06_0233EEC4
ldr r0, [r0]
add r0, r0, #0x20
bl sub_0205F0B8
bl AddMissionToJobList
bl sub_0205F5A8
bl sub_0205F710
#ifdef EUROPE
@ -803,7 +803,7 @@ _0233D454:
mov r1, #0
ldr r0, [r0]
add r0, r0, #0x20
bl sub_02069800
bl CreateJobSummary
ldr r0, _0233D4CC ; =ov06_0233EEC4
mov r1, #0x324
ldr r0, [r0]
@ -964,7 +964,7 @@ _0233D690:
bne _0233DC68
bl ov01_0232F3F4
bl ov06_0233CA80
bl sub_0205ED84
bl CountJobListMissions
cmp r0, #0
ldreq r0, _0233DC74 ; =ov06_0233EEEC
moveq r1, #3
@ -1701,7 +1701,7 @@ _0233E07C:
add r0, sp, #0x30
bl sub_020509BC
mov r0, r7
bl sub_0205E238
bl IsMissionTypeSpecialEpisode
cmp r0, #0
bne _0233E0EC
mov r0, r7
@ -1924,11 +1924,11 @@ _0233E390:
ldr r0, [r1, #0x218]
add r1, r1, #0x18
add r0, r1, r0, lsl #5
bl sub_0205E238
bl IsMissionTypeSpecialEpisode
cmp r0, #0
beq _0233E478
mov r0, #2
bl sub_0204C94C
bl IsSpecialEpisodeOpen
cmp r0, #0
beq _0233E418
ldr r0, _0233E8E0 ; =ov06_0233EEC8
@ -1962,7 +1962,7 @@ _0233E418:
ldr r0, [r2, #0x218]
add r2, r2, #0x18
add r0, r2, r0, lsl #5
bl sub_02069800
bl CreateJobSummary
ldr r0, _0233E8E0 ; =ov06_0233EEC8
ldr r3, _0233E920 ; =0x00002A30
ldr r2, [r0]
@ -1977,7 +1977,7 @@ _0233E478:
ldr r0, [r1, #0x218]
add r1, r1, #0x18
add r0, r1, r0, lsl #5
bl sub_0205F0B8
bl AddMissionToJobList
cmp r0, #0
ldrne r0, _0233E8E0 ; =ov06_0233EEC8
movne r1, #8
@ -1999,7 +1999,7 @@ _0233E478:
ldr r0, [r2, #0x218]
add r2, r2, #0x18
add r0, r2, r0, lsl #5
bl sub_02069800
bl CreateJobSummary
ldr r0, _0233E8E0 ; =ov06_0233EEC8
ldr r3, _0233E920 ; =0x00002A30
ldr r2, [r0]
@ -2085,7 +2085,7 @@ _0233E600:
ldr r0, [r1, #0x218]
add r1, r1, #0x18
add r0, r1, r0, lsl #5
bl sub_0205F0B8
bl AddMissionToJobList
bl sub_0205F5A8
bl sub_0205F710
ldr r0, _0233E8E0 ; =ov06_0233EEC8
@ -2101,7 +2101,7 @@ _0233E600:
ldr r0, [r2, #0x218]
add r2, r2, #0x18
add r0, r2, r0, lsl #5
bl sub_02069800
bl CreateJobSummary
ldr r0, _0233E8E0 ; =ov06_0233EEC8
ldr r3, _0233E920 ; =0x00002A30
ldr r2, [r0]
@ -2212,7 +2212,7 @@ _0233E7DC:
ldr r0, [r1, #0x218]
add r1, r1, #0x18
add r0, r1, r0, lsl #5
bl sub_0205E238
bl IsMissionTypeSpecialEpisode
cmp r0, #0
mov r0, #0x1c
beq _0233E828

View File

@ -13982,7 +13982,7 @@ _022E8254: .word ov11_02324F9C
AcceptRandomNpcJob: ; 0x022E8258
stmdb sp!, {r3, lr}
bl ov11_022E8168
bl sub_0205F0B8
bl AddMissionToJobList
cmp r0, #0
bne _022E82C0
bl sub_0205F5A8
@ -42897,7 +42897,7 @@ ov11_023001F4:
ldr r0, _0230057C ; =ov11_02324D1C
ldr r0, [r0, #4]
ldrsb r0, [r0]
bl sub_0202BBF0
bl ResumeAdvancedMenu
ldr r0, _0230057C ; =ov11_02324D1C
mov r1, #5
ldr r0, [r0, #4]
@ -44520,7 +44520,7 @@ _023017B4:
mov r1, #1
mov r0, #0x214
str r1, [r2, #0x20]
bl sub_020558F4
bl GetFirstMatchingMemberIdx
mvn r1, #0
cmp r0, r1
bne _02301804
@ -44900,7 +44900,7 @@ _02301D30:
mov r1, #1
mov r0, #0x214
str r1, [r2, #0x20]
bl sub_020558F4
bl GetFirstMatchingMemberIdx
mvn r1, #0
cmp r0, r1
bne _02301D80
@ -53612,7 +53612,7 @@ _02309538:
ldr r0, _02309D80 ; =ov11_02324D90
ldr r0, [r0]
ldrsb r0, [r0, #4]
bl sub_0202A954
bl ResumeParentMenu
ldr r0, _02309D80 ; =ov11_02324D90
mov r1, #1
ldr r0, [r0]
@ -64055,7 +64055,7 @@ ov11_02311D80: ; 0x02311D80
stmia lr, {r0, r1, r2, r3}
mov r0, ip
mov r1, #0
bl sub_02069800
bl CreateJobSummary
ldr r0, _02311E28 ; =ov11_02324E10
mov r1, #1
ldr r0, [r0, #4]

View File

@ -3373,7 +3373,7 @@ _0238CD5C:
ldrsb r0, [r0, #0xb]
cmp r0, r1
beq _0238CD78
bl sub_0202BBF0
bl ResumeAdvancedMenu
_0238CD78:
mov r0, #0x34
bl ov18_0238BE28
@ -3554,7 +3554,7 @@ _0238CF6C:
ldrsb r0, [r0, #0xb]
cmp r0, r1
beq _0238CF88
bl sub_0202BBF0
bl ResumeAdvancedMenu
_0238CF88:
mov r0, #0x3c
bl ov18_0238BE28

View File

@ -2311,7 +2311,7 @@ _0238BFDC:
cmpne r2, #2
bne _0238C048
ldrsb r0, [r0, #4]
bl sub_0202B490
bl ResumeSimpleMenu
ldr r0, _0238C1D0 ; =OVERLAY20_UNKNOWN_POINTER__NA_238D128
ldr r0, [r0]
bl ov20_0238C2B8

View File

@ -6896,11 +6896,11 @@ ov31_023886DC: ; 0x023886DC
arm_func_start ov31_023886F4
ov31_023886F4: ; 0x023886F4
ldr ip, _02388700 ; =sub_0202A954
ldr ip, _02388700 ; =ResumeParentMenu
ldrsb r0, [r0]
bx ip
.align 2, 0
_02388700: .word sub_0202A954
_02388700: .word ResumeParentMenu
arm_func_end ov31_023886F4
arm_func_start ov31_02388704
@ -7760,7 +7760,7 @@ _02389298:
ldr r0, _023893FC ; =OVERLAY31_UNKNOWN_POINTER__NA_238A28C
ldr r0, [r0]
ldrsb r0, [r0]
bl sub_0202A954
bl ResumeParentMenu
ldr r0, _023893FC ; =OVERLAY31_UNKNOWN_POINTER__NA_238A28C
mov r1, #1
ldr r0, [r0]
@ -8075,7 +8075,7 @@ _023896F0:
add r0, r5, #1
bl ov29_0234E988
ldrsb r0, [r5]
bl sub_0202A954
bl ResumeParentMenu
b _023898AC
_0238970C:
ldr r0, [r5, #0x4e8]
@ -8101,7 +8101,7 @@ _02389748:
add r0, r5, #1
bl ov29_0234E988
ldrsb r0, [r5]
bl sub_0202A954
bl ResumeParentMenu
ldrsb r0, [r5]
add r1, r5, #0xc4
bl sub_0202A98C
@ -8118,7 +8118,7 @@ _02389780:
add r0, r5, #1
bl ov29_0234E988
ldrsb r0, [r5]
bl sub_0202A954
bl ResumeParentMenu
b _023898AC
_023897A8:
ldrsb r1, [r5]
@ -8557,7 +8557,7 @@ _02389D1C:
cmp r4, #0
beq _02389D6C
mov r0, r5
bl sub_0202A954
bl ResumeParentMenu
_02389D6C:
add sp, sp, #0x5c
ldmia sp!, {r4, r5, r6, r7, pc}