Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-09-10 12:28:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24 from AnonymousRandomPerson/main

Browse Source 
Defined more pointers
This commit is contained in:
AnonymousRandomPerson
2023-09-19 00:22:01 -04:00
committed by GitHub
parent 8adac323e5 3ce3f43d87
commit fe9dcab4c0
63 changed files with 14772 additions and 10885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/overlay_11.inc
View File

@@ -149,8 +149,8 @@
.public MemFree
.public MemsetSimple
.public MemZero
.public ov00_022BCCF4
.public ov00_022BCD10
.public ov10_022BCCF4
.public ov10_022BCD10
.public ov00_022E0378
.public ov00_022E03F0
.public ov00_022E0434

4
asm/include/overlay_13.inc
View File

@@ -30,13 +30,13 @@
.public IsNormalMenuActive
.public MemAlloc
.public MemFree
.public ov00_022E6E68
.public ov00_0230D71C
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov11_022E6EC8
.public ov11_022EB3C8
.public ov11_023039D4
.public ov11_02303D80
.public ov11_0230D71C
.public PreprocessString
.public PreprocessStringFromMessageId
.public RandInt

60
asm/include/overlay_15.inc
View File

@@ -1,38 +1,38 @@
#pragma once
.public ShowDBox
.public sub_02039B0C
.public PreprocessStringFromMessageId
.public sub_020395CC
.public InitPreprocessorArgs
.public InitPortraitBoxWithMonsterId
.public sub_020396E4
.public sub_0202F8C4
.public FreeNormalMenu
.public GetGold
.public sub_02027B1C
.public ShowPortraitBox
.public sub_02017C80
.public SetPortraitLayout
.public sub_020305B4
.public sub_02026214
.public MemAlloc
.public sub_0201070C
.public sub_02026268
.public sub_0202F8FC
.public AddMoneyCarried
.public sub_0203083C
.public CreateDBox
.public sub_0202F954
.public sub_020288DC
.public MemFree
.public SetPortraitEmotion
.public sub_020308A0
.public ShowMessageInDBox
.public sub_02027AF0
.public CreateNormalMenu
.public sub_0203088C
.public CreatePortraitBox
.public DebugPrint0
.public FreeNormalMenu
.public GetGold
.public GetNormalMenuResult
.public sub_02010758
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public IsDBoxActive
.public MemAlloc
.public MemFree
.public PreprocessStringFromMessageId
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public sub_0201070C
.public sub_02010758
.public sub_02017C80
.public sub_02026214
.public sub_02026268
.public sub_02027AF0
.public sub_02027B1C
.public sub_020288DC
.public sub_0202F8C4
.public sub_0202F8FC
.public sub_0202F954
.public sub_020305B4
.public sub_0203083C
.public sub_0203088C
.public sub_020308A0
.public sub_020395CC
.public sub_020396E4
.public sub_02039B0C

98
asm/include/overlay_16.inc
View File

@@ -1,56 +1,60 @@
#pragma once
.public sub_0202836C
.public ShowPortraitBox
.public StrcpySimple
.public sub_0202F2C4
.public sub_02056410
.public PreprocessString
.public IncrementNbEvolutions
.public SetTeamSetupHeroOnly
.public GetMainCharacter1MemberIdx
.public sub_020572EC
.public ov11_02310BDC
.public SetPortraitEmotion
.public MemFree
.public sub_0205A288
.public IsMonsterOnTeam
.public sub_02059B08
.public IsMonsterNotNicknamed
.public GetFirstUnequippedItemOfType
.public sub_0203F150
.public sub_02039C3C
.public GetNameRaw
.public sub_02056880
.public GetEvolutionPossibilities
.public sub_020582E0
.public RemoveItemNoHole
.public ShowKeyboard
.public CreateAdvancedMenu
.public CreateDBox
.public CreateNormalMenu
.public CreatePortraitBox
.public EVOLUTION_HP_BONUS
.public EVOLUTION_PHYSICAL_STAT_BONUSES
.public EVOLUTION_SPECIAL_STAT_BONUSES
.public FreeDBox
.public FreeNormalMenu
.public GetActiveTeamMember
.public GetEvolutionPossibilities
.public GetFirstUnequippedItemOfType
.public GetItemAtIdx
.public GetMainCharacter1MemberIdx
.public GetNameRaw
.public GetNameString
.public GetTeamMember
.public IncrementNbEvolutions
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public sub_02010260
.public sub_02017CB4
.public CreatePortraitBox
.public GetNameString
.public IsMainCharacter
.public FreeNormalMenu
.public CreateDBox
.public sub_02017C50
.public SetPortraitLayout
.public sub_02025314
.public GetTeamMember
.public StrncpySimpleNoPadSafe
.public GetActiveTeamMember
.public GetItemAtIdx
.public sub_0203C7E4
.public sub_0203A638
.public ShowMessageInDBox
.public FreeDBox
.public sub_0203909C
.public ShowDBox
.public CreateAdvancedMenu
.public MemAlloc
.public IsMonsterNotNicknamed
.public IsMonsterOnTeam
.public IsValidTeamMember
.public MemAlloc
.public MemFree
.public ov11_02310BDC
.public PreprocessString
.public RemoveItemNoHole
.public SetPokemonJoined
.public SetPortraitEmotion
.public SetPortraitLayout
.public SetTeamSetupHeroOnly
.public ShowDBox
.public ShowKeyboard
.public ShowMessageInDBox
.public ShowPortraitBox
.public StrcpySimple
.public StrncpySimpleNoPadSafe
.public sub_02010260
.public sub_02017C50
.public sub_02017CB4
.public sub_02025314
.public sub_0202836C
.public sub_0202F2C4
.public sub_0203909C
.public sub_02039C3C
.public sub_0203A638
.public sub_0203C7E4
.public sub_0203F150
.public sub_02056410
.public sub_020564B0
.public sub_02056880
.public sub_020572EC
.public sub_020582E0
.public sub_02059B08
.public sub_0205A288
.public sub_0205B008
.public TEAM_MEMBER_TABLE_PTR

162
asm/include/overlay_17.inc
View File

@@ -1,89 +1,91 @@
#pragma once
.public FreeNormalMenu
.public CreateDBox
.public CreateNormalMenu
.public sub_0202E6B0
.public sub_020566C4
.public sub_0203A5A8
.public PrintIqSkillsMenu
.public sub_0202F66C
.public sub_02034A38
.public sub_0202E6E4
.public sub_02017CCC
.public sub_0203A638
.public sub_0203A618
.public sub_02056754
.public sub_02041178
.public MemFree
.public CreatePortraitBox
.public FreeDBox
.public FreeNormalMenu
.public FreePortraitBox
.public GetActiveRosterIndex
.public GetGameMode
.public GetMainCharacter1MemberIdx
.public GetNormalMenuResult
.public sub_0203FA64
.public sub_0203AF0C
.public sub_0203A9B8
.public sub_02017C10
.public IsDBoxActive
.public sub_0203F398
.public sub_02056410
.public sub_0202F334
.public HidePortraitBox
.public sub_0203C7E4
.public sub_020407C0
.public sub_0203F990
.public FreeDBox
.public sub_020307EC
.public InitPreprocessorArgs
.public sub_0203C760
.public sub_0202E6C8
.public GetGameMode
.public sub_02056554
.public sub_0203088C
.public sub_02055B20
.public sub_020407EC
.public sub_0204018C
.public sub_02041A00
.public sub_0203AA20
.public sub_02017C50
.public ov11_022DC504
.public sub_0203FD80
.public sub_02057444
.public IsNormalMenuActive
.public sub_02057180
.public MemAlloc
.public sub_02058138
.public sub_0203A9EC
.public sub_020308C4
.public sub_020417A8
.public sub_0203A51C
.public sub_020308A0
.public GetPressedButtons
.public sub_0203C910
.public sub_0203C9C4
.public sub_0203A5F0
.public FreePortraitBox
.public sub_0203AAB0
.public GetActiveRosterIndex
.public ShowPortraitBox
.public sub_0203C940
.public SetPortraitLayout
.public ShowMessageInDBox
.public ov00_022E6E68
.public sub_0203C9E4
.public sub_0205B028
.public ShowDBox
.public sub_0203F150
.public GetPartnerMemberIdx
.public sub_0203C874
.public sub_02041B7C
.public sub_02039C3C
.public sub_0203C8E0
.public sub_0203A998
.public sub_020572EC
.public IsMainCharacter
.public sub_020420F4
.public CreatePortraitBox
.public GetTeamMember
.public GetPerformanceFlagWithChecks
.public GetPressedButtons
.public GetTeamMember
.public HidePortraitBox
.public InitPortraitBoxWithMonsterId
.public CreateDBox
.public sub_020564B0
.public InitPreprocessorArgs
.public IsDBoxActive
.public IsMainCharacter
.public IsNormalMenuActive
.public MemAlloc
.public MemFree
.public ov11_022E6E68
.public ov11_022DC504
.public ov11_0238A08C
.public PrintIqSkillsMenu
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public sub_02017C10
.public sub_02017C50
.public sub_02017CCC
.public sub_0202E6B0
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F334
.public sub_0202F66C
.public sub_020307EC
.public sub_0203088C
.public sub_020308A0
.public sub_020308C4
.public sub_02034A38
.public sub_02039C3C
.public sub_0203A51C
.public sub_0203A5A8
.public sub_0203A5F0
.public sub_0203A618
.public sub_0203A638
.public sub_0203A998
.public sub_0203A9B8
.public sub_0203A9EC
.public sub_0203AA20
.public sub_0203AAB0
.public sub_0203AF0C
.public sub_0203C760
.public sub_0203C7E4
.public sub_0203C874
.public sub_0203C8E0
.public sub_0203C910
.public sub_0203C940
.public sub_0203C9C4
.public sub_0203C9E4
.public sub_0203F150
.public sub_0203F398
.public sub_0203F990
.public sub_0203FA64
.public sub_0203FD80
.public sub_0204018C
.public sub_020407C0
.public sub_020407EC
.public sub_02041178
.public sub_020417A8
.public sub_02041A00
.public sub_02041B7C
.public sub_020420F4
.public sub_02055B20
.public sub_02056410
.public sub_020564B0
.public sub_02056554
.public sub_020566C4
.public sub_02056754
.public sub_02056F60
.public sub_02057180
.public sub_020572EC
.public sub_02057444
.public sub_02058138
.public sub_0205B028
.public TEAM_MEMBER_TABLE_PTR

196
asm/include/overlay_18.inc
View File

@@ -1,113 +1,115 @@
#pragma once
.public sub_020572EC
.public sub_02017C74
.public sub_02041424
.public sub_0202F66C
.public sub_0202F334
.public AddMoneyCarried
.public sub_0203FD2C
.public sub_0203FA64
.public PrintIqSkillsMenu
.public sub_0203A9B8
.public sub_0202E6B0
.public sub_02041400
.public sub_020407C0
.public sub_02041414
.public IsDBoxActive
.public sub_02041394
.public sub_0203FD80
.public HidePortraitBox
.public sub_02041194
.public sub_0203A618
.public MemFree
.public sub_0203A9EC
.public GetEncodedHalfword
.public GetAdvancedMenuResult
.public GetNormalMenuResult
.public sub_020407EC
.public MemAlloc
.public GetMoveName
.public sub_02041A00
.public GetGold
.public CreateAdvancedMenu
.public CreateDBox
.public CreateNormalMenu
.public CreatePortraitBox
.public FreeAdvancedMenu
.public sub_020412B0
.public sub_0204159C
.public GetMovesetLevelUpPtr
.public sub_02017CCC
.public vsprintf
.public sub_02041614
.public sub_0203A5A8
.public sub_0203088C
.public sub_0203A5F0
.public sub_0202BC60
.public sub_0203A638
.public sub_02027B1C
.public PreprocessString
.public InitPreprocessorArgs
.public FreePortraitBox
.public sub_020308C4
.public sub_0202C1E4
.public sub_0203FD38
.public GetAdvancedMenuCurrentOption
.public sub_02027AF0
.public sub_02017C80
.public FreeDBox
.public FreeNormalMenu
.public sub_020573A0
.public sub_02041094
.public sub_0203AAB0
.public sub_02041154
.public sub_02053880
.public sub_02026268
.public sub_0202E6C8
.public sub_0202F8FC
.public sub_02041364
.public sub_0202BBF0
.public FreePortraitBox
.public GetAdvancedMenuCurrentOption
.public GetAdvancedMenuResult
.public GetEncodedHalfword
.public GetEvoFamily
.public sub_02026214
.public sub_0203A51C
.public sub_02041484
.public sub_020410A4
.public sub_0202FB9C
.public GetGold
.public GetMoveName
.public GetMovesetLevelUpPtr
.public GetNormalMenuResult
.public GetPressedButtons
.public sub_020416DC
.public sub_020308A0
.public HidePortraitBox
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public IsDBoxActive
.public IsNormalMenuActive
.public MemAlloc
.public memcpy
.public MemFree
.public ov11_022E6E68
.public ov11_0238A090
.public PreprocessString
.public PrintIqSkillsMenu
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public StrncpySimpleNoPadSafe
.public sub_02017C74
.public sub_02017C80
.public sub_02017CCC
.public sub_02026214
.public sub_02026268
.public sub_02027AF0
.public sub_02027B1C
.public sub_0202BBF0
.public sub_0202BC60
.public sub_0202BCBC
.public sub_0202C1E4
.public sub_0202E6B0
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F334
.public sub_0202F66C
.public sub_0202F8C4
.public sub_0202F8FC
.public sub_0202F954
.public sub_0202FB9C
.public sub_020307EC
.public sub_0203088C
.public sub_020308A0
.public sub_020308C4
.public sub_02039C2C
.public sub_0203A51C
.public sub_0203A5A8
.public sub_0203A5F0
.public sub_0203A618
.public sub_0203A638
.public sub_0203A998
.public sub_0203A9B8
.public sub_0203A9EC
.public sub_0203AA20
.public sub_0203AAB0
.public sub_0203F150
.public sub_0203F398
.public sub_0203F990
.public sub_0202F954
.public IsNormalMenuActive
.public sub_0203AA20
.public sub_020416BC
.public memcpy
.public sub_020307EC
.public sub_020415BC
.public sub_0203FA64
.public sub_0203FD14
.public sub_0202BCBC
.public sub_02041000
.public sub_02041B7C
.public sub_02041A18
.public sub_020564B0
.public SetPortraitEmotion
.public CreateNormalMenu
.public sub_0203F150
.public SetPortraitLayout
.public sub_0203FD2C
.public sub_0203FD38
.public sub_0203FD80
.public sub_0204018C
.public sub_02041860
.public sub_020420F4
.public sub_0203A998
.public InitPortraitBoxWithMonsterId
.public sub_020407C0
.public sub_020407EC
.public sub_02040FA8
.public CreatePortraitBox
.public sub_02041000
.public sub_02041094
.public sub_020410A4
.public sub_02041154
.public sub_02041178
.public StrncpySimpleNoPadSafe
.public ShowDBox
.public ShowPortraitBox
.public ov00_022E6E68
.public CreateAdvancedMenu
.public sub_02039C2C
.public sub_02041194
.public sub_020412B0
.public sub_02041364
.public sub_02041394
.public sub_02041400
.public sub_02041414
.public sub_02041424
.public sub_02041484
.public sub_0204159C
.public sub_020415BC
.public sub_02041614
.public sub_020416BC
.public sub_020416DC
.public sub_020417A8
.public sub_0202F8C4
.public ShowMessageInDBox
.public sub_02041860
.public sub_02041A00
.public sub_02041A18
.public sub_02041B7C
.public sub_020420F4
.public sub_02053880
.public sub_020564B0
.public sub_020572EC
.public sub_020573A0
.public sub_0205B028
.public CreateDBox
.public TEAM_MEMBER_TABLE_PTR
.public vsprintf

255
asm/include/overlay_19.inc
View File

@@ -1,136 +1,137 @@
#pragma once
.public sub_0203EFD4
.public sub_020117C0
.public ov10_022BCC60
.public ov11_0230A390
.public sub_02046BE8
.public sub_0204018C
.public PrintIqSkillsMenu
.public ov11_0230A31C
.public ov10_022BD474
.public sub_02041A18
.public ov11_02311D6C
.public IsGummi
.public sub_02046C30
.public HidePortraitBox
.public sub_02056094
.public sub_020308A0
.public sub_0203F990
.public sub_02017CCC
.public sub_020572EC
.public ov10_022BCDBC
.public GetBodySize
.public sub_02020868
.public RemoveItemNoHole
.public sub_02065BAC
.public sub_02011528
.public GetScenarioBalance
.public PreprocessString
.public sub_02055474
.public sub_0202E6C8
.public sub_0202A66C
.public sub_0203F150
.public ov00_022BCCF4
.public MemcpySimple
.public sub_020580C4
.public ProcessGinsengOverworld
.public sub_0200FC24
.public sub_02065CB4
.public ov10_022BCDF4
.public sub_0202E3CC
.public sub_02046A20
.public sub_02046BA0
.public sub_020117FC
.public PreprocessStringFromMessageId
.public GetLearnableIqSkills
.public sub_0204D018
.public sub_02046C78
.public sub_0201077C
.public EnableIqSkill
.public InitPreprocessorArgs
.public MemAlloc
.public GetCurrentBagCapacity
.public abs
.public CanMonsterBeUsedForMissionWrapper
.public CreatePortraitBox
.public sub_0203AA20
.public sub_0203A638
.public sub_02041B7C
.public sub_02054FEC
.public sub_020115BC
.public sub_0200D0A0
.public ov11_0230AD50
.public ov10_022BCC7C
.public ov00_022BCD10
.public ov10_022BCE58
.public ov11_0230AD7C
.public ShowPortraitBox
.public sub_02039C2C
.public sub_0203D538
.public strcat
.public SetPortraitOffset
.public sub_020417A8
.public sub_0201170C
.public ov10_022BCDA8
.public sub_02055054
.public DungeonSwapIdToIdx
.public EnableIqSkill
.public FemaleToMaleForm
.public FreePortraitBox
.public GetBodySize
.public GetCurrentBagCapacity
.public GetDungeonMode
.public GetFirstEmptyMemberIdx
.public GetItemAtIdx
.public GetLearnableIqSkills
.public GetMaxReachedFloor
.public GetPerformanceFlagWithChecks
.public ov10_022BCCB0
.public sub_020407EC
.public GetPressedButtons
.public GetScenarioBalance
.public GetSecondFormIfValid
.public GetStringFromFileVeneer
.public GetTeamMember
.public HidePortraitBox
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public InitRandomNpcJobs
.public IsGummi
.public IsMainCharacter
.public MemAlloc
.public MemcpySimple
.public MemFree
.public MemZero
.public ov10_022BCCF4
.public ov10_022BCD10
.public ov11_0230D220
.public ov10_022BCC60
.public ov10_022BCC7C
.public ov10_022BCCB0
.public ov10_022BCD68
.public ov10_022BCDA8
.public ov10_022BCDBC
.public ov10_022BCDF4
.public ov10_022BCE58
.public ov10_022BD394
.public ov10_022BD474
.public ov11_0230A31C
.public ov11_0230A390
.public ov11_0230AD50
.public ov11_0230AD7C
.public ov11_02311D6C
.public ov11_02324DB0
.public PreprocessString
.public PreprocessStringFromMessageId
.public PrintIqSkillsMenu
.public ProcessGinsengOverworld
.public RandInt
.public RandRange
.public RemoveItemNoHole
.public SetPortraitEmotion
.public SetPortraitLayout
.public SetPortraitOffset
.public ShowPortraitBox
.public strcat
.public sub_0200D0A0
.public sub_0200FC24
.public sub_0201077C
.public sub_02011528
.public sub_02011580
.public sub_020115BC
.public sub_0201170C
.public sub_02011748
.public sub_02011784
.public sub_020117C0
.public sub_020117FC
.public sub_02011830
.public sub_02011850
.public sub_02017C50
.public sub_02017C74
.public sub_02017CCC
.public sub_02020868
.public sub_0202A66C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_020308A0
.public sub_02034A38
.public sub_02039C2C
.public sub_0203A51C
.public sub_0203A5A8
.public sub_0203A5F0
.public sub_0203A638
.public sub_0203A998
.public sub_0203A9EC
.public sub_0203AA20
.public sub_0203AAB0
.public sub_0203D438
.public sub_0203D538
.public sub_0203EFD4
.public sub_0203F150
.public sub_0203F398
.public sub_0203F990
.public sub_0203FA64
.public sub_0203FD38
.public ov00_0230D220
.public GetTeamMember
.public IsMainCharacter
.public sub_0203A5A8
.public sub_02011850
.public sub_0203F398
.public FreePortraitBox
.public sub_0205B028
.public InitPortraitBoxWithMonsterId
.public sub_0203A51C
.public ov10_022BD394
.public SetPortraitEmotion
.public GetItemAtIdx
.public sub_0203A5F0
.public GetStringFromFileVeneer
.public RandInt
.public sub_02011748
.public ov10_022BCD68
.public sub_02055410
.public sub_020564B0
.public sub_0203AAB0
.public GetPressedButtons
.public MemZero
.public sub_02011830
.public sub_0202E6E4
.public sub_02011580
.public sub_02055020
.public CanMonsterBeUsedForMissionWrapper
.public abs
.public sub_02011784
.public sub_0203A9EC
.public GetMaxReachedFloor
.public sub_0206351C
.public sub_0203D438
.public sub_02054FB8
.public sub_02034A38
.public MemFree
.public sub_0203A998
.public sub_02041094
.public RandRange
.public sub_02046B04
.public sub_0203FD80
.public GetDungeonMode
.public sub_020420F4
.public sub_02065B70
.public InitRandomNpcJobs
.public FemaleToMaleForm
.public DungeonSwapIdToIdx
.public sub_02041A00
.public sub_02057AC4
.public GetFirstEmptyMemberIdx
.public SetPortraitLayout
.public sub_02056E04
.public sub_0204018C
.public sub_020407C0
.public sub_020407EC
.public sub_02041094
.public sub_020417A8
.public sub_02041A00
.public sub_02041A18
.public sub_02041B7C
.public sub_020420F4
.public sub_02046A20
.public sub_02046B04
.public sub_02046BA0
.public sub_02046BE8
.public sub_02046C30
.public sub_02046C78
.public sub_02046D20
.public sub_02017C74
.public sub_02017C50
.public sub_0204D018
.public sub_02054FB8
.public sub_02054FEC
.public sub_02055020
.public sub_02055054
.public sub_02055410
.public sub_02055474
.public sub_02056094
.public sub_020564B0
.public sub_02056E04
.public sub_020572EC
.public sub_02057AC4
.public sub_020580C4
.public sub_0205B028
.public sub_0206351C
.public sub_02065B70
.public sub_02065BAC
.public sub_02065CB4

178
asm/include/overlay_20.inc
View File

@@ -1,99 +1,99 @@
#pragma once
.public sub_020125CC
.public sub_0202C70C
.public InitPreprocessorArgs
.public sub_02012294
.public sub_0202E6C8
.public InitPortraitBoxWithMonsterId
.public sub_0202D0EC
.public sub_0202C748
.public sub_0202C794
.public sub_02011DFC
.public sub_0202C7A8
.public MemZero
.public sub_02011CF4
.public sub_0201271C
.public Arm9LoadUnkFieldNa0x2029EC8
.public sub_0202C620
.public sub_0202F8FC
.public PreprocessStringFromMessageId
.public sub_0202B1AC
.public sub_02011F48
.public sub_02026214
.public sub_0202A03C
.public sub_0202E3CC
.public sub_020124D8
.public sub_0202B544
.public sub_02011DF0
.public sub_0202E6E4
.public sub_02017CCC
.public AddItemToBagNoHeld
.public IsNormalMenuActive
.public sub_02046A20
.public sub_0202F8DC
.public FreePortraitBox
.public sub_02012518
.public CreateNormalMenu
.public sub_02027B1C
.public ov00_0230D71C
.public sub_02027AF0
.public sub_0202C3A8
.public __divsi3
.public MemFree
.public sub_02046D20
.public sub_02011EC4
.public sub_0202B530
.public sub_0202C7E4
.public sub_0202F9B8
.public sub_02011F60
.public AddItemToBagNoHeld
.public Arm9LoadUnkFieldNa0x2029EC8
.public CreateNormalMenu
.public CreatePortraitBox
.public InitStandardItem
.public sub_02017C50
.public GetNormalMenuResult
.public sub_02046C78
.public sub_02011F30
.public sub_02017C10
.public sub_02046B04
.public sub_02011EE8
.public FreeNormalMenu
.public sub_0200D670
.public sub_02011D9C
.public MemAlloc
.public sub_020103AC
.public sub_02011F14
.public sub_02046C30
.public sub_0202B490
.public sub_02025D50
.public FreePortraitBox
.public GetItemAtIdx
.public ShowPortraitBox
.public sub_020327CC
.public SetPortraitEmotion
.public sub_02011E18
.public GetNormalMenuResult
.public HidePortraitBox
.public sub_0202B568
.public StringFromMessageId
.public sub_0202C75C
.public Rand16Bit
.public sub_02011DB8
.public sub_0202D16C
.public sub_02011E24
.public IsTicketItem
.public sub_0201227C
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public InitStandardItem
.public IsBagFull
.public sub_0202B558
.public sub_0202C728
.public ov00_0230D220
.public sub_02011E68
.public sub_02012874
.public sub_020017EC
.public sub_02010044
.public sub_0201255C
.public sub_0202C7BC
.public ov11_0230DB58
.public SetPortraitLayout
.public sub_020037A4
.public IsNormalMenuActive
.public IsTicketItem
.public MemAlloc
.public MemFree
.public MemZero
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov00_022E6E68
.public ov11_0230CCE0
.public ov11_022E6EC8
.public ov11_0230CCE0
.public ov11_0230CCF0
.public ov11_0230D220
.public ov11_0230D71C
.public ov11_0230DB58
.public PreprocessStringFromMessageId
.public Rand16Bit
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowPortraitBox
.public StringFromMessageId
.public sub_020017EC
.public sub_020037A4
.public sub_0200D670
.public sub_02010044
.public sub_020103AC
.public sub_02011CF4
.public sub_02011D9C
.public sub_02011DB8
.public sub_02011DF0
.public sub_02011DFC
.public sub_02011E18
.public sub_02011E24
.public sub_02011E68
.public sub_02011EC4
.public sub_02011EE8
.public sub_02011F14
.public sub_02011F30
.public sub_02011F48
.public sub_02011F60
.public sub_0201227C
.public sub_02012294
.public sub_020124D8
.public sub_02012518
.public sub_0201255C
.public sub_020125CC
.public sub_0201271C
.public sub_02012874
.public sub_02017C10
.public sub_02017C50
.public sub_02017CCC
.public sub_02025D50
.public sub_02026214
.public sub_02027AF0
.public sub_02027B1C
.public sub_0202A03C
.public sub_0202B1AC
.public sub_0202B490
.public sub_0202B530
.public sub_0202B544
.public sub_0202B558
.public sub_0202B568
.public sub_0202C3A8
.public sub_0202C620
.public sub_0202C70C
.public sub_0202C728
.public sub_0202C748
.public sub_0202C75C
.public sub_0202C794
.public sub_0202C7A8
.public sub_0202C7BC
.public sub_0202C7E4
.public sub_0202D0EC
.public sub_0202D16C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F8DC
.public sub_0202F8FC
.public sub_0202F9B8
.public sub_020327CC
.public sub_02046A20
.public sub_02046B04
.public sub_02046C30
.public sub_02046C78
.public sub_02046D20

192
asm/include/overlay_21.inc
View File

@@ -1,103 +1,103 @@
#pragma once
.public MemAlloc
.public SetPortraitLayout
.public ov11_0230C910
.public ShowMessageInDBox
.public PrintIqSkillsMenu
.public GetGold
.public sub_0204018C
.public sub_020101A0
.public CreateNormalMenu
.public RemoveItemsTypeInStorage
.public IsBagFull
.public sub_0205B028
.public sub_0202836C
.public ov11_0230C068
.public SpecialProcAddItemToBag
.public AddMoneyCarried
.public RemoveItem
.public sub_02039C2C
.public sub_020417A8
.public sub_02027AF0
.public ov11_0230B20C
.public sub_0202E3CC
.public SetPortraitEmotion
.public sub_0202F8FC
.public sub_0200D0A0
.public sub_02013150
.public GetTeamMember
.public sub_02027B1C
.public DebugPrint0
.public sub_0203FA64
.public MemFree
.public sub_0203F150
.public ShowDBox
.public ShowPortraitBox
.public FreeNormalMenu
.public CreatePortraitBox
.public InitPreprocessorArgs
.public InitPortraitBoxWithMonsterId
.public RemoveEmptyItemsInBag
.public ov11_0230BB98
.public HidePortraitBox
.public sub_0202F2C4
.public PreprocessString
.public sub_0201007C
.public sub_02026268
.public RemoveItemByIdAndStackNoHole
.public sub_02026214
.public ov11_022DC504
.public CreateDBox
.public AddItemToStorage
.public sub_0202F8C4
.public ov11_0230C910
.public AddMoneyCarried
.public CreateDBox
.public CreateNormalMenu
.public CreatePortraitBox
.public DebugPrint0
.public FreeDBox
.public FreeNormalMenu
.public FreePortraitBox
.public GetGold
.public GetNormalMenuResult
.public GetPressedButtons
.public sub_02041B7C
.public GetTeamMember
.public HidePortraitBox
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public InitRandomNpcJobs
.public IsBagFull
.public IsDBoxActive
.public MemAlloc
.public MemcpySimple
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov11_022E6EC8
.public ov11_0230B20C
.public ov11_0230B694
.public ov11_0230B874
.public ov11_0230B8C0
.public ov11_0230B914
.public ov11_0230B958
.public ov11_0230B9BC
.public ov11_0230BA64
.public ov11_0230BB1C
.public ov11_0230BB98
.public ov11_0230BCF8
.public ov11_0230BD28
.public ov11_0230C050
.public ov11_0230C068
.public ov11_0230C118
.public ov11_0230C910
.public ov11_0230C910
.public ov11_0230D220
.public ov11_0230D92C
.public ov11_02310C2C
.public PreprocessString
.public PrintIqSkillsMenu
.public RemoveEmptyItemsInBag
.public RemoveItem
.public RemoveItemByIdAndStackNoHole
.public RemoveItemsTypeInStorage
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public SpecialProcAddItemToBag
.public sub_0200D0A0
.public sub_0201007C
.public sub_020101A0
.public sub_02013150
.public sub_02017C74
.public sub_02017C80
.public sub_02017CCC
.public sub_02026214
.public sub_02026268
.public sub_02027AF0
.public sub_02027B1C
.public sub_0202836C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F2C4
.public sub_0202F8C4
.public sub_0202F8FC
.public sub_020308A0
.public sub_02039C2C
.public sub_0203A51C
.public sub_0203A5A8
.public sub_0203A5F0
.public sub_0203A638
.public sub_0203A5A8
.public sub_0203A51C
.public sub_020407C0
.public MemcpySimple
.public ov11_0230B9BC
.public sub_020420F4
.public ov00_0230D92C
.public ov00_022E6E68
.public sub_02017CCC
.public ov11_0230B958
.public sub_0203AAB0
.public sub_02041A00
.public ov11_0230B8C0
.public FreePortraitBox
.public sub_02017C74
.public sub_0203F990
.public ov11_0230B914
.public ov11_0230BB1C
.public FreeDBox
.public ov11_022E6EC8
.public ov11_02310C2C
.public ov11_022E6E8C
.public sub_020572EC
.public ov11_0230B694
.public sub_020308A0
.public ov11_0230C118
.public sub_02041A18
.public GetNormalMenuResult
.public ov11_0230BCF8
.public sub_0203F398
.public ov11_0230B874
.public sub_020407EC
.public ov11_0230BA64
.public ov00_0230D220
.public InitRandomNpcJobs
.public sub_0203FD38
.public sub_0202E6C8
.public ov11_0230C050
.public sub_0203FD80
.public sub_02017C80
.public ov11_0230BD28
.public IsDBoxActive
.public sub_02041094
.public sub_0202E6E4
.public sub_0203A9EC
.public sub_0203AA20
.public sub_0203AAB0
.public sub_0203F150
.public sub_0203F398
.public sub_0203F990
.public sub_0203FA64
.public sub_0203FD38
.public sub_0203FD80
.public sub_0204018C
.public sub_020407C0
.public sub_020407EC
.public sub_02041094
.public sub_020417A8
.public sub_02041A00
.public sub_02041A18
.public sub_02041B7C
.public sub_020420F4
.public sub_020572EC
.public sub_0205B028

174
asm/include/overlay_22.inc
View File

@@ -1,91 +1,93 @@
#pragma once
.public sub_0204426C
.public GetNbItemsInBag
.public MemFree
.public sub_02010B3C
.public IsShoppableItem
.public SpecialProcAddItemToBag
.public CreatePortraitBox
.public InitPortraitBoxWithMonsterId
.public sub_0202C3A8
.public sub_0200D65C
.public sub_0202D16C
.public strcpy
.public sub_0202C75C
.public sub_02010BC0
.public GetGold
.public sub_0202E3CC
.public SetPortraitEmotion
.public sub_02010B78
.public PreprocessString
.public sub_0202C728
.public MemAlloc
.public CreateNormalMenu
.public sub_0202C5F4
.public FreeNormalMenu
.public ShowDBox
.public sub_02042B98
.public sub_0204440C
.public sub_02042B84
.public CreateDBox
.public sub_02010830
.public Arm9LoadUnkFieldNa0x2029EC8
.public sub_02042730
.public sub_02044568
.public sub_0202F2C4
.public GetActualSellPrice
.public GetActualBuyPrice
.public sub_02017CCC
.public sub_0202C7D0
.public DebugPrint0
.public ShowMessageInDBox
.public strcat
.public sub_02042BBC
.public Arm9StoreUnkFieldNa0x2029ED8
.public sub_02042258
.public sub_0200D670
.public GetCurrentBagCapacity
.public sub_02010BA4
.public sub_020108B4
.public sub_02042AF8
.public sub_0202C748
.public sub_02010898
.public InitPreprocessorArgs
.public ShowPortraitBox
.public SetPortraitLayout
.public sub_0201086C
.public AddMoneyCarried
.public HidePortraitBox
.public sub_0202D114
.public GetPressedButtons
.public sub_020582E0
.public sub_02042664
.public IsBagFull
.public sub_0202C70C
.public InitStandardItem
.public sub_0202E6E4
.public sub_02042AAC
.public ov00_022E6E68
.public sub_02044474
.public Arm9LoadUnkFieldNa0x2029EC8
.public Arm9StoreUnkFieldNa0x2029ED8
.public BAG_ITEMS_PTR_MIRROR
.public CreateDBox
.public CreateNormalMenu
.public CreatePortraitBox
.public DebugPrint0
.public FreeDBox
.public sub_020445C8
.public sub_02042ADC
.public sub_0202836C
.public RemoveItemNoHoleCheck
.public sub_02042B50
.public sub_0202C620
.public IsDBoxActive
.public GetNormalMenuResult
.public FreeNormalMenu
.public FreePortraitBox
.public sub_020444B0
.public ov11_022DC504
.public RemoveEmptyItemsInBag
.public sub_02017C74
.public sub_0202E6C8
.public RemoveItem
.public sub_02042B20
.public sub_02017C80
.public sub_02042744
.public sub_020442CC
.public sub_020426B4
.public GetActualBuyPrice
.public GetActualSellPrice
.public GetCurrentBagCapacity
.public GetGold
.public GetItemAtIdx
.public GetNbItemsInBag
.public GetNormalMenuResult
.public GetPressedButtons
.public HidePortraitBox
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public InitStandardItem
.public IsBagFull
.public IsDBoxActive
.public IsShoppableItem
.public MemAlloc
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_0238A130
.public PreprocessString
.public RemoveEmptyItemsInBag
.public RemoveItem
.public RemoveItemNoHoleCheck
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public SpecialProcAddItemToBag
.public strcat
.public strcpy
.public sub_0200D65C
.public sub_0200D670
.public sub_02010830
.public sub_0201086C
.public sub_02010898
.public sub_020108B4
.public sub_02010B3C
.public sub_02010B78
.public sub_02010BA4
.public sub_02010BC0
.public sub_02017C74
.public sub_02017C80
.public sub_02017CCC
.public sub_0202836C
.public sub_0202C3A8
.public sub_0202C5F4
.public sub_0202C620
.public sub_0202C70C
.public sub_0202C728
.public sub_0202C748
.public sub_0202C75C
.public sub_0202C7D0
.public sub_0202D114
.public sub_0202D16C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F2C4
.public sub_02042258
.public sub_02042664
.public sub_020426B4
.public sub_02042730
.public sub_02042744
.public sub_02042AAC
.public sub_02042ADC
.public sub_02042AF8
.public sub_02042B20
.public sub_02042B50
.public sub_02042B84
.public sub_02042B98
.public sub_02042BBC
.public sub_0204426C
.public sub_020442CC
.public sub_0204440C
.public sub_02044474
.public sub_020444B0
.public sub_02044568
.public sub_020445C8
.public sub_020582E0

146
asm/include/overlay_23.inc
View File

@@ -1,79 +1,81 @@
#pragma once
.public sub_0200D670
.public CreateDBox
.public SpecialProcAddItemToBag
.public IsBagFull
.public sub_02044094
.public sub_0201007C
.public sub_02042B98
.public sub_0202836C
.public sub_02034A38
.public sub_02042CF0
.public ShowPortraitBox
.public SetPortraitLayout
.public RemoveItem
.public RemoveEmptyItemsInBag
.public sub_02043218
.public sub_02043320
.public CreatePortraitBox
.public ShowDBox
.public FreeNormalMenu
.public SetPortraitEmotion
.public ShowMessageInDBox
.public sub_0202F2C4
.public sub_020440DC
.public sub_020103AC
.public sub_02042B84
.public GetItemAtIdx
.public sub_0200FFAC
.public sub_0202E3CC
.public sub_02042258
.public InitPreprocessorArgs
.public sub_02010154
.public GetNormalMenuResult
.public MemAlloc
.public ov11_022DC504
.public GetNbItemsInBag
.public MemFree
.public sub_02042730
.public IsDBoxActive
.public HidePortraitBox
.public sub_02042AF8
.public PreprocessString
.public BAG_ITEMS_PTR_MIRROR
.public CopyItemAtIdx
.public sub_020434D4
.public sub_02043380
.public CreateDBox
.public CreateNormalMenu
.public RemoveItemNoHole
.public CreatePortraitBox
.public DebugPrint0
.public sub_02043568
.public sub_020582E0
.public InitPortraitBoxWithMonsterId
.public sub_020101A0
.public IsStorableItem
.public GetPressedButtons
.public sub_02042744
.public sub_02043400
.public sub_0204352C
.public sub_0200FFF4
.public ov00_022E6E68
.public sub_02042B50
.public HasStorableItems
.public sub_02042BBC
.public sub_020433C0
.public sub_02042AAC
.public sub_02017CCC
.public FreeDBox
.public sub_02043434
.public sub_0202E6E4
.public sub_02042664
.public sub_020434FC
.public sub_0204323C
.public sub_020426B4
.public sub_0202E6C8
.public FreeNormalMenu
.public FreePortraitBox
.public sub_02043468
.public sub_0204317C
.public sub_02042B20
.public sub_020440B8
.public GetItemAtIdx
.public GetNbItemsInBag
.public GetNormalMenuResult
.public GetPressedButtons
.public HasStorableItems
.public HidePortraitBox
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public IsBagFull
.public IsDBoxActive
.public IsStorableItem
.public MemAlloc
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_0238A134
.public PreprocessString
.public RemoveEmptyItemsInBag
.public RemoveItem
.public RemoveItemNoHole
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public SpecialProcAddItemToBag
.public sub_0200D670
.public sub_0200FFAC
.public sub_0200FFF4
.public sub_0201007C
.public sub_02010154
.public sub_020101A0
.public sub_020103AC
.public sub_02017CCC
.public sub_0202836C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F2C4
.public sub_02034A38
.public sub_02042258
.public sub_02042664
.public sub_020426B4
.public sub_02042730
.public sub_02042744
.public sub_02042AAC
.public sub_02042ADC
.public sub_02042AF8
.public sub_02042B20
.public sub_02042B50
.public sub_02042B84
.public sub_02042B98
.public sub_02042BBC
.public sub_02042CF0
.public sub_0204317C
.public sub_02043218
.public sub_0204323C
.public sub_02043320
.public sub_02043380
.public sub_020433C0
.public sub_02043400
.public sub_02043434
.public sub_02043468
.public sub_020434D4
.public sub_020434FC
.public sub_0204352C
.public sub_02043568
.public sub_02044094
.public sub_020440B8
.public sub_020440DC
.public sub_020582E0

128
asm/include/overlay_24.inc
View File

@@ -1,68 +1,72 @@
#pragma once
.public ShowDBox
.public Rand16Bit
.public StrncpySimple
.public SpecialProcAddItemToBag
.public strcpy
.public ov11_02306C9C
.public sub_02052F8C
.public ov11_022DC504
.public sub_020107AC
.public sub_0202F2C4
.public sub_0202836C
.public CreateNormalMenu
.public sub_0203EFD4
.public sub_02017C50
.public IsBagFull
.public SetPokemonJoined
.public IsDBoxActive
.public ShowKeyboard
.public sub_0200EB90
.public sub_02037468
.public SpecialStrcpy
.public sub_02055DD0
.public MemAlloc
.public FreeNormalMenu
.public CreateDBox
.public StrcpySimple
.public FreeDBox
.public sub_02039218
.public GetNormalMenuResult
.public ShowPortraitBox
.public MemFree
.public GetNameRaw
.public sub_0203931C
.public sub_02017C10
.public sub_0203909C
.public ov11_02306C64
.public sub_0203D438
.public ov00_0230D220
.public CreatePortraitBox
.public InitPortraitBoxWithMonsterId
.public sub_02053B60
.public StrncpySimpleNoPadSafe
.public ov11_02310BDC
.public sub_0203D538
.public sub_0206351C
.public sub_0202C70C
.public SetPortraitEmotion
.public sub_0201077C
.public GetNameWithGender
.public GetFirstEmptyMemberIdx
.public HidePortraitBox
.public SetPortraitLayout
.public sub_0200D670
.public ov11_023061E4
.public ShowMessageInDBox
.public __divsi3
.public InitPreprocessorArgs
.public sub_020107C4
.public sub_02017CB4
.public IncrementNbEggsHatched
.public sub_020107DC
.public _020A1868
.public _020A18E0
.public CreateDBox
.public CreateNormalMenu
.public CreatePortraitBox
.public EGG_HP_BONUS
.public EGG_STAT_BONUSES
.public FreeDBox
.public FreeNormalMenu
.public FreePortraitBox
.public GetAdventureLogCompleted
.public GetFirstEmptyMemberIdx
.public GetKeyboardStatus
.public GetKeyboardStringResult
.public GetNameRaw
.public GetNameWithGender
.public GetNormalMenuResult
.public HidePortraitBox
.public IncrementNbEggsHatched
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public IsBagFull
.public IsDBoxActive
.public MemAlloc
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_023061E4
.public ov11_02306C64
.public ov11_02306C9C
.public ov11_0230D220
.public ov11_02310BDC
.public Rand16Bit
.public SetPokemonJoined
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowKeyboard
.public ShowMessageInDBox
.public ShowPortraitBox
.public SpecialProcAddItemToBag
.public SpecialStrcpy
.public strcpy
.public StrcpySimple
.public StrncpySimple
.public StrncpySimpleNoPadSafe
.public sub_0200D670
.public sub_0200EB90
.public sub_0201077C
.public sub_02010794
.public FreePortraitBox
.public ov00_022E6E68
.public sub_020107AC
.public sub_020107C4
.public sub_020107DC
.public sub_02017C10
.public sub_02017C50
.public sub_02017CB4
.public sub_0202836C
.public sub_0202C70C
.public sub_0202F2C4
.public sub_02037468
.public sub_0203909C
.public sub_02039218
.public sub_0203931C
.public sub_0203D438
.public sub_0203D538
.public sub_0203EFD4
.public sub_02052F8C
.public sub_02053B60
.public sub_02055DD0
.public sub_0206351C

94
asm/include/overlay_25.inc
View File

@@ -1,55 +1,55 @@
#pragma once
.public sub_0202E6E4
.public ov11_0230BCF8
.public CreatePortraitBox
.public CreateNormalMenu
.public sub_02017C80
.public sub_0202E6C8
.public AddItemToBagNoHeld
.public AddMoneyCarried
.public CreateDBox
.public sub_0200D670
.public ov11_0230C910
.public sub_0202F8FC
.public sub_02027B1C
.public PreprocessString
.public SetPortraitLayout
.public CreateNormalMenu
.public CreatePortraitBox
.public FreeDBox
.public FreeNormalMenu
.public FreePortraitBox
.public GetGold
.public GetNbItemsInBag
.public GetNormalMenuResult
.public GetPressedButtons
.public HidePortraitBox
.public ov11_0230B8C0
.public sub_0200D0A0
.public sub_02026214
.public GetNbItemsInBag
.public ov11_0230B20C
.public ShowPortraitBox
.public RemoveItemByIdAndStackNoHole
.public IsDBoxActive
.public ov11_0230BA64
.public ShowMessageInDBox
.public ov11_0230B9BC
.public sub_02017C74
.public sub_0202E3CC
.public MemAlloc
.public sub_0202F2C4
.public InitPortraitBoxWithMonsterId
.public ov11_0230BD28
.public GetNormalMenuResult
.public SetPortraitEmotion
.public ShowDBox
.public sub_0202F8C4
.public sub_02026268
.public IsThrownItem
.public ov11_022DC504
.public MemFree
.public sub_0202F918
.public AddItemToBagNoHeld
.public GetGold
.public AddMoneyCarried
.public InitPreprocessorArgs
.public sub_02027AF0
.public FreeNormalMenu
.public sub_0202836C
.public ov11_0230B724
.public FreePortraitBox
.public FreeDBox
.public IsDBoxActive
.public IsThrownItem
.public MemAlloc
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov00_022E6E68
.public ov11_022E6EC8
.public ov11_0230B20C
.public ov11_0230B724
.public ov11_0230B8C0
.public ov11_0230B9BC
.public ov11_0230BA64
.public ov11_0230BCF8
.public ov11_0230BD28
.public ov11_0230C910
.public PreprocessString
.public RemoveItemByIdAndStackNoHole
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public ShowPortraitBox
.public sub_0200D0A0
.public sub_0200D670
.public sub_02017C74
.public sub_02017C80
.public sub_02026214
.public sub_02026268
.public sub_02027AF0
.public sub_02027B1C
.public sub_0202836C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F2C4
.public sub_0202F8C4
.public sub_0202F8FC
.public sub_0202F918

102
asm/include/overlay_26.inc
View File

@@ -1,61 +1,61 @@
#pragma once
.public sub_0205633C
.public IsMoneyAllowed
.public ov11_0230CDE0
.public InitPreprocessorArgs
.public SetMoneyCarried
.public sub_0206351C
.public sub_0204F158
.public sub_0204E780
.public sub_02056318
.public sub_020587C8
.public RemoveAllItemsStartingAt
.public SetChallengeLetterCleared
.public sub_0205F118
.public FreePortraitBox
.public sub_0205F9D4
.public GetOutlawLeaderLevel
.public ov11_022E6E8C
.public IncrementExclusiveMonsterCounts
.public sub_0204C5DC
.public sub_02062E5C
.public GetGameMode
.public CreateDBox
.public CreatePortraitBox
.public DebugPrint0
.public FreeDBox
.public IsMonsterOnTeam
.public MemAlloc
.public sub_0204E770
.public SaveScriptVariableValue
.public GetMaxItemsAllowed
.public ov00_022E6E68
.public FreePortraitBox
.public GetAcceptedMission
.public sub_020577BC
.public GetGameMode
.public GetMaxItemsAllowed
.public GetOutlawLeaderLevel
.public IncrementExclusiveMonsterCounts
.public IncrementNbAdventures
.public IncrementNbDungeonsCleared
.public IncrementNbFainted
.public InitPortraitBox
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public IsDBoxActive
.public IsMoneyAllowed
.public IsMonsterOnTeam
.public LoadScriptVariableValue
.public MemAlloc
.public MemFree
.public sub_020587E0
.public ov10_022BD56C
.public ov10_022BD5AC
.public ov10_022BD718
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov11_0230CDE0
.public RemoveAllItemsStartingAt
.public SaveScriptVariableValue
.public SetChallengeLetterCleared
.public SetMoneyCarried
.public ShowMessageInDBox
.public ShowPortraitBox
.public sub_0203D438
.public sub_0203D538
.public sub_0203EFD4
.public sub_0204665C
.public sub_02046698
.public sub_02046740
.public sub_0204677C
.public sub_0204AFD0
.public sub_0203EFD4
.public sub_0204F1B4
.public ov10_022BD56C
.public IsDBoxActive
.public InitPortraitBoxWithMonsterId
.public sub_0204F244
.public IncrementNbAdventures
.public ShowPortraitBox
.public IncrementNbFainted
.public sub_0204C5DC
.public sub_0204E770
.public sub_0204E780
.public sub_0204F0A0
.public sub_02046698
.public sub_0203D438
.public LoadScriptVariableValue
.public CreateDBox
.public sub_0204665C
.public InitPortraitBox
.public ShowMessageInDBox
.public sub_0204F158
.public sub_0204F1B4
.public sub_0204F244
.public sub_02056318
.public sub_0205633C
.public sub_020577BC
.public sub_020587C8
.public sub_020587E0
.public sub_0205B77C
.public CreatePortraitBox
.public DebugPrint0
.public sub_0205F118
.public sub_0205F9D4
.public sub_02062E5C
.public sub_0206351C
.public sub_02065974
.public IncrementNbDungeonsCleared
.public ov10_022BD718
.public sub_0203D538
.public ov10_022BD5AC

150
asm/include/overlay_27.inc
View File

@@ -1,85 +1,87 @@
#pragma once
.public sub_02042CF0
.public sub_0200D670
.public GetGold
.public sub_02044094
.public sub_02050CE4
.public IsStorableItem
.public CreateNormalMenu
.public RemoveItem
.public sub_0202E3CC
.public sub_02042730
.public ShowDBox
.public sub_02010758
.public sub_02043218
.public sub_020440DC
.public GetNbItemsInBag
.public PreprocessStringFromMessageId
.public InitPreprocessorArgs
.public ShowMessageInDBox
.public MemFree
.public AddMoneyCarried
.public ov11_022DC504
.public sub_02043380
.public sub_0200FD78
.public sub_02042258
.public sub_0202836C
.public DebugPrint0
.public CreateDBox
.public sub_0202F2C4
.public FreeNormalMenu
.public sub_020434D4
.public sub_02042AF8
.public InitPortraitBoxWithMonsterId
.public SetPortraitLayout
.public IsDBoxActive
.public sub_020103AC
.public sub_02043320
.public sub_0201070C
.public MemAlloc
.public sub_02034A38
.public sub_02042B98
.public BAG_ITEMS_PTR_MIRROR
.public CopyItemAtIdx
.public RemoveEmptyItemsInBag
.public PreprocessString
.public sub_0200FD48
.public sub_02042AAC
.public sub_020433C0
.public CreateDBox
.public CreateNormalMenu
.public DebugPrint0
.public FreeDBox
.public sub_02043568
.public sub_0202E6E4
.public FreeNormalMenu
.public FreePortraitBox
.public sub_02042744
.public sub_0204317C
.public sub_0200FFAC
.public sub_020426B4
.public RemoveItemNoHole
.public sub_0200FFF4
.public ov11_022E6EC8
.public sub_02042BBC
.public ov11_0230CE58
.public sub_02043468
.public sub_02042B20
.public sub_0202E6C8
.public sub_02042B50
.public sub_02042B84
.public sub_0202A66C
.public sub_02042664
.public ov11_022E6E8C
.public sub_02042ADC
.public sub_020582E0
.public sub_0201007C
.public sub_0202F23C
.public sub_02017CCC
.public sub_0204352C
.public GetGold
.public GetItemAtIdx
.public GetNbItemsInBag
.public GetNormalMenuResult
.public sub_02043400
.public GetPressedButtons
.public InitPortraitBoxWithMonsterId
.public InitPreprocessorArgs
.public IsDBoxActive
.public IsStorableItem
.public MemAlloc
.public MemFree
.public ov11_022DC504
.public ov11_022E6E68
.public ov11_022E6E8C
.public ov11_022E6EC8
.public ov11_0230CE58
.public ov11_02324DB8
.public PreprocessString
.public PreprocessStringFromMessageId
.public RemoveEmptyItemsInBag
.public RemoveItem
.public RemoveItemNoHole
.public SetPortraitLayout
.public ShowDBox
.public ShowMessageInDBox
.public sub_0200D670
.public sub_0200FD48
.public sub_0200FD78
.public sub_0200FFAC
.public sub_0200FFF4
.public sub_0201007C
.public sub_02010154
.public sub_020101A0
.public sub_020434FC
.public sub_020103AC
.public sub_0201070C
.public sub_02010758
.public sub_02017CCC
.public sub_0202836C
.public sub_0202A66C
.public sub_0202E3CC
.public sub_0202E6C8
.public sub_0202E6E4
.public sub_0202F23C
.public sub_0202F2C4
.public sub_02034A38
.public sub_02042258
.public sub_02042664
.public sub_020426B4
.public sub_02042730
.public sub_02042744
.public sub_02042AAC
.public sub_02042ADC
.public sub_02042AF8
.public sub_02042B20
.public sub_02042B50
.public sub_02042B84
.public sub_02042B98
.public sub_02042BBC
.public sub_02042CF0
.public sub_0204317C
.public sub_02043218
.public sub_0204323C
.public sub_02043320
.public sub_02043380
.public sub_020433C0
.public sub_02043400
.public sub_02043434
.public GetPressedButtons
.public sub_02043468
.public sub_020434D4
.public sub_020434FC
.public sub_0204352C
.public sub_02043568
.public sub_02044094
.public sub_020440B8
.public ov00_022E6E68
.public GetItemAtIdx
.public sub_020440DC
.public sub_02050CE4
.public sub_020582E0

32
asm/include/overlay_28.inc
View File

@@ -1,23 +1,23 @@
#pragma once
.public NewDialogBox
.public strcpy
.public sub_02028EE8
.public sub_020348E4
.public sub_02026214
.public sub_02028270
.public sub_02028F88
.public sub_0202825C
.public sub_02025C14
.public sub_0202810C
.public GetStringFromFileVeneer
.public MemAlloc
.public MemFree
.public NewDialogBox
.public ov11_022E6E8C
.public ov11_022E6EC8
.public strcpy
.public sub_02025B80
.public sub_02025B90
.public sub_02025C14
.public sub_02026214
.public sub_02027170
.public sub_02027228
.public GetStringFromFileVeneer
.public sub_02025B90
.public sub_0202810C
.public sub_0202822C
.public ov11_022E6E8C
.public sub_02028FA0
.public sub_02025B80
.public sub_0202825C
.public sub_02028270
.public sub_02028354
.public ov11_022E6EC8
.public sub_02028EE8
.public sub_02028F88
.public sub_02028FA0
.public sub_020348E4

663
asm/include/overlay_29.inc
View File

@@ -1,663 +0,0 @@
#pragma once
.public ov31_02388714
.public ov10_022BEC94
.public GetAcceptedMission
.public ov30_023838E4
.public ov10_022C22A0
.public sub_02052EFC
.public sub_02003990
.public strlen
.public sub_020091B0
.public sub_020091CC
.public FemaleToMaleForm
.public sub_0201E13C
.public Arm9LoadUnkFieldNa0x2029EC8
.public IsHealingWishOrLunarDance
.public sub_02017C68
.public IsLevelResetDungeon
.public GetNbFloorsPlusOne
.public GetNbItemsInBag
.public ChangeGiratinaFormIfSkyDungeon
.public GetTurnLimit
.public ov30_0238367C
.public IsMonsterOnTeam
.public Is2TurnsMove
.public AddMoneyCarried
.public sub_0202836C
.public CanThrowItems
.public MultiplyByFixedPoint
.public GetNameWithGender
.public sub_02020880
.public IsItemForSpecialSpawnInBag
.public LoadWteFromFileDirectory
.public sub_020063F4
.public sub_02063734
.public sub_02051E20
.public TestItemAiFlag
.public GetBodySize
.public sub_0200D894
.public GetSpriteFileSize
.public sub_020566C4
.public GetTreasureBoxChances
.public MemAlloc
.public IsItemInBag
.public ov30_02383434
.public sub_02057EF4
.public ov30_0238298C
.public sub_02048360
.public IsAuraBow
.public ov10_022BDB80
.public CanEnemyEvolve
.public sub_02030214
.public InitMove
.public sub_0205BAB0
.public GetExp
.public InitStandardItem
.public ov10_022BF160
.public sub_02017CCC
.public sub_02052E2C
.public sub_02048384
.public GetSecondFormIfValid
.public RandInt
.public GetMovesetLevelUpPtr
.public sub_02056880
.public sub_0201C000
.public sub_0206367C
.public CreateDBox
.public GetBgRegionArea
.public GetEvolutions
.public sub_0201E380
.public sub_0201BE84
.public ov10_022C159C
.public ov10_022C0F6C
.public memset
.public sub_0205349C
.public ov10_022C14D0
.public ov10_022BDB54
.public sub_02008BF4
.public sub_02017B00
.public sub_0201E020
.public sub_0201DE10
.public IsRecoilMove
.public sub_02056264
.public sub_020091F8
.public sub_02008F88
.public sub_0201C0CC
.public sub_02009514
.public sub_02056754
.public DecrementStackItem
.public sub_020038E8
.public sub_020585B4
.public ov31_02388114
.public SetAndPlayAnimationForAnimationControl
.public sub_0200FA68
.public ov10_022BDC0C
.public sub_020519D0
.public ov10_022BF45C
.public sub_0202F474
.public GetKeyboardStatus
.public ShuffleHiddenPower
.public IsReflectedByMagicCoat
.public sub_0201BD1C
.public sub_02050F78
.public sub_02058644
.public sub_02017C80
.public PreprocessString
.public sub_02008ED0
.public sub_02056084
.public ov10_022C2278
.public ov00_022BFDAC
.public ov10_022C0998
.public sub_0204833C
.public GetFirstEmptyMemberIdx
.public IsItemValidVeneer
.public sub_0201F598
.public sub_0204AF00
.public GetMonsterIdFromSpawnEntry
.public IsHM
.public ShowPortraitBox
.public GetBaseDefensiveStat
.public GetItemCategoryVeneer
.public GetMoveMessageFromId
.public GetEffectAnimationField0x19
.public GetMoveNbStrikes
.public sub_0202AB94
.public RestMenu
.public sub_0205B77C
.public sub_0202715C
.public IsBackgroundTileset
.public GetCanMoveFlag
.public sub_0204AEE0
.public sub_0201CF90
.public ov10_022BFD58
.public sub_02017A68
.public ov10_022BEC08
.public sub_02050FF8
.public sub_0200CF6C
.public AddItemToBagNoHeld
.public DeleteWanTableEntryVeneer
.public ov10_022BFAA8
.public sub_02028E40
.public IsFutureDungeon
.public ov10_022C2638
.public strncpy
.public ov10_022BF01C
.public sub_0201D7E0
.public Arm9StoreUnkFieldNa0x2029ED8
.public ov30_023853BC
.public sub_02051DFC
.public GetSize
.public GetSpeedStatus
.public GetKeyboardStringResult
.public sub_02054FB8
.public ov30_02382E18
.public sub_02015588
.public ov10_022BEFD8
.public GetActiveTeamMember
.public sub_02058534
.public SetVictoriesOnOneFloor
.public sub_02051D68
.public IsDojoDungeon
.public sub_02009120
.public IqSkillFlagTest
.public sub_0200F910
.public IsShaymin
.public GetMoveBasePower
.public ov00_0233103C
.public sub_020483B8
.public RemoveEquivItemNoHole
.public TeamMenu
.public LoadWanTableEntryFromPackUseProvidedMemory
.public sub_0201CF5C
.public MemZero
.public sub_0204F610
.public sub_02057E90
.public ov10_022BFD6C
.public GetShadowSize
.public HidePortraitBox
.public CreatePortraitBox
.public IsLosableItem
.public sub_0201BF4C
.public SetScreenWindowsColor
.public __divsi3
.public sub_02047FFC
.public sub_02001AB0
.public sub_02025784
.public sub_0204AF10
.public RemoveEquivItem
.public FailsWhileMuzzled
.public ov31_0238941C
.public StrncpySimple
.public ov10_022C26BC
.public sub_0204AEA0
.public RefillTeam
.public sub_02053904
.public ov10_022BEB2C
.public FixedPoint64IsZero
.public ov10_022C096C
.public sub_02048150
.public sub_0204AF78
.public sub_02055D7C
.public sub_0201E050
.public ov01_023315F4
.public sub_02017B64
.public sub_02063770
.public SetBothScreensWindowsColor
.public sub_02028A64
.public SetDungeonTipShown
.public sub_020308A0
.public sub_02048DC4
.public sub_02051D8C
.public sub_02053D1C
.public AllowPortraitDefault
.public sub_0202F334
.public sub_02017D80
.public StrncpySimpleNoPad
.public DivideFixedPoint64
.public ov30_02385FE0
.public sub_02051ED4
.public CanMonsterSpawn
.public IsEdible
.public sub_0201551C
.public GetMoveTargetAndRange
.public SetMonsterId
.public sub_0200383C
.public sub_0200FBE0
.public sub_02053250
.public FreeDBox
.public ov10_022BFA3C
.public MultiplyFixedPoint64
.public CanBeSnatched
.public ov30_02382C68
.public sub_0202A5CC
.public ov10_022BF7D4
.public GetGold
.public ov30_023833D8
.public GetItemMoveId16
.public sub_02011220
.public sub_02017A20
.public IsBagFull
.public sub_0202F8C4
.public sub_02017B7C
.public sub_0208FC8C
.public sub_0204E114
.public IsAffectedByTaunt
.public GendersEqualNotGenderless
.public GetLowKickMultiplier
.public sub_02037468
.public GetRecruitRate2
.public sub_020018A4
.public GetCurrentBagCapacity
.public sub_0204AE80
.public SetPortraitLayout
.public GetPerformanceFlagWithChecks
.public MemFree
.public SetItemAcquired
.public ov30_02382C30
.public HandleSir0Translation
.public IsIqEnabled
.public sub_0203931C
.public LoadWanTableEntryFromPack
.public IsItemWithFlagsInBag
.public AnimationHasMoreFrames
.public GetMoveMaxGinsengBoost
.public SetPokemonJoined
.public ov31_023860A4
.public DebugPrint0
.public sub_0204AF20
.public SetMonsterFlag2
.public ReplaceWanFromBinFile
.public sub_0200D208
.public sub_02028E88
.public ShowKeyboard
.public ov10_022BF1FC
.public sub_02051DD0
.public sub_0201405C
.public ov10_022BDE50
.public GetMoveBasePp
.public sub_0205858C
.public sub_02054EC8
.public ov31_02387688
.public IsMoveRangeString19
.public CreateMainMenus
.public sub_02017BEC
.public vsprintf
.public sub_0202AAE8
.public ov10_022BFB6C
.public GetMaxReachedFloor
.public IsMoneyAllowed
.public sub_02017B70
.public OverlayIsLoaded
.public sub_02017C50
.public sub_0205A450
.public GetBaseForm
.public GetMoveCritChance
.public GetItemIndex
.public RemoveEmptyItemsInBag
.public GetNameRaw
.public RetrieveFromItemList1
.public sub_02024FE8
.public abs
.public SwitchAnimationControlToNextFrame
.public sub_02050964
.public ov30_023829A0
.public sub_0202AABC
.public sub_0204F1B4
.public ItemZInit
.public ExclusiveItemEffectFlagTest
.public GetSpriteSize
.public GetType
.public sub_0201D1B0
.public sub_02025314
.public SetMoneyCarried
.public sub_02048240
.public sub_02051EB8
.public sub_02008F3C
.public ov10_022BF2B4
.public ov10_022BFC5C
.public GetItemSpriteId
.public sub_0201BFF0
.public sub_020038D8
.public sub_0204AEB0
.public sub_0201E080
.public GetLearnableIqSkills
.public sub_0200A544
.public SetMaxReachedFloor
.public GetMobilityType
.public ov10_022C2720
.public IsOneHitKoMove
.public sub_020778D0
.public SubFixedPoint
.public GetOutlawMinionLevel
.public GetExclusiveItem
.public sub_0201F464
.public IncrementNbSteals
.public GetEvoParameters
.public GetMoveAnimationSpeed
.public ProcessWte
.public sub_02051B44
.public PointsToZero
.public sub_0201BE28
.public SetAdventureLogDungeonFloor
.public sub_0200B3D4
.public sub_0200A2F4
.public GetActualSellPrice
.public AllocAndLoadFileInPack
.public ov10_022BE9E8
.public ov30_023853E0
.public sub_02006BFC
.public ov10_022C1DE0
.public sub_0200F940
.public GetGameMode
.public sub_0204AFF8
.public ov10_022C13B4
.public sub_02050EBC
.public IsTreasureBox
.public sub_020634F4
.public ov31_02388E88
.public sub_02056830
.public sub_0201BCF4
.public sub_02006EC4
.public ov30_023842F4
.public sub_02017A80
.public GetActualBuyPrice
.public ov10_022BDC68
.public RemoveItem
.public sub_02027148
.public sub_02055020
.public ov31_023877EC
.public SetSpriteIdForAnimationControl
.public GetMonsterPreEvolution
.public sub_0201CF80
.public IsShoppableItem
.public IsSkyExclusiveDungeon
.public SetPokemonBattled
.public InitPortraitBox
.public FreePortraitBox
.public sub_02063830
.public GetSpeciesIqSkill
.public sub_0204804C
.public sub_0202AB40
.public sub_020090A0
.public GetLanguage
.public GetEncodedHalfword
.public ov10_022BF764
.public sub_02028848
.public sub_02053038
.public sub_02003A40
.public FixedPoint64CmpLt
.public strncmp
.public GetReleasedStylus
.public IsExpEnabledInDungeon
.public GetOutlawLevel
.public FormatMoveString
.public IsPunchMove
.public ov31_02386C6C
.public ov31_02388444
.public sub_0202F23C
.public ov10_022C09E8
.public RemoveHeldItemNoHole
.public sub_0204AEF0
.public DungeonGoesUp
.public sub_02017B18
.public sub_02001980
.public IsCopyingMove
.public ov10_022C2654
.public GetHeldButtons
.public sub_020534BC
.public Rand16Bit
.public ov10_022BDBB0
.public sub_0200A174
.public ov30_023829CC
.public IsRecruitingAllowed
.public ov30_02382820
.public GetEquivItemIndex
.public sub_0201BCCC
.public ov10_022C26A0
.public UnloadCurrentWazaP
.public GetName
.public DungeonRequestsDoneWrapper
.public InitRender3dElement64
.public sub_020483D8
.public ov10_022C1E80
.public LoadFileFromRom
.public ov30_02382E08
.public UnloadWte
.public sub_02058C3C
.public ClampedLn
.public sub_0202AB80
.public sub_0202F954
.public UnloadOverlay
.public GetMonsterEvoStatus
.public sub_0201B9F8
.public GetNbPrecedingFloors
.public LoadWtuFromBin
.public AddItemToBag
.public GetMaxPp
.public IntToFixedPoint64
.public ov10_022BF0F4
.public ov31_02386308
.public sub_02017C10
.public strcmp
.public ov10_022C0814
.public ov10_022C1E50
.public sub_020305E4
.public sub_02030044
.public sub_020510E8
.public sub_0201D034
.public DungeonFloorToGroupFloor
.public sub_02034A80
.public sub_02056698
.public GetBaseHp
.public sub_02054FEC
.public sub_0201D804
.public GetPressedButtons
.public sub_02058674
.public sub_020348E4
.public UnloadFile
.public GetEquippedThrowableItem
.public sub_0203909C
.public sub_02017C74
.public ov10_022C16D8
.public GetTalkLine
.public GetSpawnThreshold
.public sub_0202ABB0
.public WanTableSpriteHasAnimationGroup
.public ov30_02382A34
.public SetMonsterLevelAndId
.public ov31_02386204
.public InitPreprocessorArgs
.public GetDungeonMode
.public sub_02026214
.public sub_02048134
.public sub_02051E60
.public GetMoveType
.public GetMoveAnimation
.public ov10_022C0CE0
.public sub_0203083C
.public NeedsItemToSpawn
.public IsCastform
.public TreasureBoxDropsEnabled
.public sub_0202F8FC
.public ov10_022BF274
.public sub_0201BF64
.public sub_02063504
.public sub_0200D1FC
.public ov10_022BDBA4
.public RoundUpDiv256
.public sub_020480CC
.public GetHero
.public sub_02055CCC
.public GetMoveAccuracyOrAiChance
.public GetMonsterGenderVeneer
.public GroundToDungeonMoveset
.public sub_020275DC
.public Memset32
.public ov10_022C25EC
.public ov10_022BED90
.public sub_0201116C
.public LoadScriptVariableValue
.public ov31_023886DC
.public sub_02034710
.public sub_0202F918
.public sub_0201F2A0
.public sub_0200B3FC
.public CheckAcceptedMissionByTypeAndDungeon
.public JoinedAtRangeCheck2
.public sub_0201BAC8
.public GetFileLengthInPackWithPackNb
.public GetMonsterLevelFromSpawnEntry
.public sub_02001888
.public sub_02008F84
.public sub_0204F10C
.public sub_020093BC
.public ov10_022BFD20
.public ov10_022BFDCC
.public sub_02024FB8
.public sub_0201BE5C
.public ov31_0238647C
.public sub_0200FAEC
.public ClearItem
.public sub_020094C4
.public ov10_022BDB60
.public ov31_0238619C
.public ov10_022C2588
.public IsTrapInvisibleWhenAttacking
.public GetNameString
.public StrncpySimpleNoPadSafe
.public ov31_023886D4
.public sub_02061DC8
.public ov30_023851C0
.public sub_020275C0
.public sub_02017A00
.public sub_02006564
.public sub_02015328
.public IsThawingMove
.public sub_0200F9B4
.public strcpy
.public GetMissionRank
.public EnableIqSkill
.public CanLearnIqSkill
.public sub_0201D1D4
.public sub_0200B330
.public GetRecruitRate1
.public ov10_022BFE6C
.public sub_02025888
.public FixedPoint64ToInt
.public sub_020584FC
.public GetEffectAnimation
.public sub_0204AF30
.public IsNotMoney
.public GetRandomMovementChance
.public sub_02009454
.public HasPlayedOldGame
.public ov10_022C11D8
.public sub_020018D0
.public ov31_02387660
.public sub_0200A2CC
.public ZInit8
.public sub_020039E4
.public JoinedAtRangeCheck
.public strcat
.public AddFixedPoint64
.public sub_02051C24
.public sub_020017EC
.public sub_0201DDFC
.public GetExplorerMazeMonster
.public ov10_022BDAB0
.public sub_0202FFB0
.public GetLvlUpEntry
.public sub_0200D8AC
.public RemoveAllItems
.public IsDBoxActive
.public sub_02039218
.public sub_02058C9C
.public IsUnown
.public GetAbility
.public sub_0204F9CC
.public sub_02006B70
.public sub_02048400
.public sub_02058EB0
.public sub_02017ACC
.public sub_02026268
.public BinToDecFixedPoint
.public ov00_022BFDEC
.public sub_020149C0
.public sub_02017B58
.public sub_020258E4
.public sub_0201D198
.public IsTrappingMove
.public GetMoveCategory
.public sub_020301F4
.public GetMaxRescueAttempts
.public ov10_022BF9CC
.public sub_02051134
.public DisableIqSkill
.public LoadOverlay
.public sub_0203010C
.public IsSoundMove
.public sub_0204AF58
.public GetItemAtIdx
.public sub_02027AF0
.public ov10_022BF964
.public CeilFixedPoint
.public GetMaxItemsAllowed
.public sub_02024FC8
.public sub_0204AEC0
.public Memcpy32
.public sub_02051EF0
.public sub_02057CE8
.public sub_020178A8
.public sub_020282F4
.public sub_0201B43C
.public sub_02063628
.public LoadWazaP2
.public sub_02028E2C
.public sub_0200FB54
.public GetStringFromFileVeneer
.public GetOutlawLeaderLevel
.public sub_02001808
.public GetNbRecruited
.public GetDungeonTipShown
.public FixedPoint32To64
.public StringFromMessageId
.public ov10_022BF8E8
.public IsSpecialEpisodeDungeon
.public InitMoveCheckId
.public GetChanceAsleep
.public ov10_022BFD8C
.public sub_0200C008
.public IsRegularAttackOrProjectile
.public sub_02009194
.public FormatMoveStringMore
.public GetBaseOffensiveStat
.public ov10_022C21D8
.public IsSameMove
.public ov31_02388534
.public sub_0204F7A8
.public sub_02027B1C
.public IsCherrim
.public RandIntSafe
.public sub_02061F44
.public sub_0204AED0
.public GetMonsterGender
.public sub_0201D110
.public GetDamageSource
.public GetVictoriesOnOneFloor
.public GetRegenSpeed
.public ov30_02382874
.public DebugPrint0
.public GetSpriteIndex__020526EC
.public GetSpriteIndex__02052708
.public LightningRodStormDrainCheck
.public ChooseAiMove
.public AiMovement
.public sub_01FF81CC
.public sub_01FFBDF4
.public sub_01FFB62C
.public sub_01FF8C60
.public sub_01FF8130
.public GetScenarioBalance
.public CheckTeamMemberIdx
.public ov01_0233103C
.public IsMonsterIdInNormalRange

611
asm/include/overlay_29_022DC240.inc
View File

@@ -1,299 +1,340 @@
#pragma once
.public ov29_02305814
.public DebugPrint0
.public ov29_022EA428
.public sub_01FF8C60
.public GetDungeonRngPreseed
.public GetLeader
.public ov29_022F9970
.public ov29_022E2B68
.public GetDungeonMode
.public ov29_022EF8A4
.public TryActivateSlowStart
.public ov10_022C13B4
.public ov29_0233904C
.public ov29_02338D30
.public ov29_0234CA84
.public SetForcedLossReason
.public IsIqEnabled
.public sub_02017B00
.public GetBgRegionArea
.public TryActivateArtificialWeatherAbilities
.public ov29_022E081C
.public ov29_0231B460
.public InitEnemySpawnStats
.public ov29_023359F8
.public ov29_0234C738
.public ov10_022C14D0
.public DisplayMessage
.public sub_02057EF4
.public ov29_0234B4CC
.public RunFractionalTurn
.public sub_02051134
.public ov29_022E8104
.public ov29_022E6E40
.public ov29_0234BB10
.public SpawnTeam
.public sub_020275DC
.public DeleteAllMonsterSpriteFiles
.public ov29_02349C84
.public sub_01FF81CC
.public sub_0201B9F8
.public GenerateDungeonRngSeed
.public InitDungeonRng
.public ov10_022C16D8
.public ov29_022E7F7C
.public SpawnInitialMonsters
.public LoadMappaFileAttributes
.public ov29_022ECFB8
.public ov29_022E1304
.public UpdateShouldBoostKecleonShopSpawnChance
.public ov29_022E12F8
.public RefillTeam
.public ov29_02343980
.public ov29_022EAEAC
.public ov10_022C0998
.public ov29_022E7F44
.public sub_0200B330
.public UpdateMinimap
.public ov10_022BFE6C
.public sub_02051C24
.public sub_02051DD0
.public ov29_022F62CC
.public sub_02063628
.public ov29_022E9F18
.public SetDungeonRngPreseed
.public sub_02063504
.public sub_0201F598
.public TryActivateIqBooster
.public ov29_02349658
.public ov29_0233845C
.public IsBackgroundTileset
.public ov29_022E34B0
.public OpenFixedBin
.public ov10_022BDB80
.public TryInflictBurnStatusWholeTeam
.public ov29_022E0E44
.public CloseFixedBin
.public ov29_02338F48
.public sub_0205B77C
.public ov29_022F6EF4
.public sub_02051E60
.public ov29_023480FC
.public sub_02051DFC
.public FadeToBlack
.public ov10_022C22A0
.public DisplayMessage2
.public ov29_02336460
.public ov29_022E1550
.public ov29_022FA524
.public sub_0200A544
.public ov29_02335044
.public ov10_022BDB60
.public ov29_022FA2F0
.public ov29_0233A248
.public ov29_022F7910
.public ov29_0234B06C
.public sub_02008BF4
.public IsFloorOver
.public sub_02051ED4
.public sub_0204F1B4
.public ov29_0234CB34
.public MemAlloc
.public ov29_022EAD68
.public TryActivateWeather
.public sub_02058644
.public ov29_022E8708
.public ov29_022FE4A8
.public GenerateFloor
.public ov29_022FCD04
.public ov29_022ED0B0
.public ov29_0234C584
.public ov29_023484A0
.public ov29_022FBB1C
.public sub_02063734
.public ov10_022C11D8
.public ov10_022C096C
.public ov29_0234C5EC
.public ov29_02339FD0
.public sub_0200B3D4
.public ov29_0234C654
.public ov29_022FAD4C
.public EntityIsValid__022E0354
.public UpdateTrapsVisibility
.public ov29_0234BB20
.public ov29_0234CB54
.public GetMaxRescueAttempts
.public DungeonRandInt
.public ov29_023469E0
.public ov29_022F7104
.public ov29_0231B39C
.public TryForcedLoss
.public ov29_022EAF34
.public GetFloorType
.public ov29_02338868
.public sub_02051D68
.public sub_0201BAC8
.public CountItemsOnFloorForAcuteSniffer
.public ov29_022FAF08
.public ov29_022EF9B8
.public sub_02001808
.public ov29_0234BA18
.public ov29_023488C8
.public SetMinimapDataE447
.public ov29_022E6F94
.public Rand16Bit
.public DetermineAllTilesWalkableNeighbors
.public ov29_02338F10
.public ov29_022ED888
.public IncrementNbSteals
.public SetBothScreensWindowColorToDefault
.public SpawnShopkeepers
.public ov29_0234B1A4
.public __divsi3
.public ov29_02348894
.public sub_01FF8130
.public ov29_022E1640
.public ov29_022E15C8
.public _020AFC4C
.public _020AFC70
.public AllocAndLoadFileInPack
.public ov29_0233A1BC
.public UnloadFile
.public ov29_02344C4C
.public SetMaxReachedFloor
.public ov29_022E0DFC
.public ov29_02339F88
.public sub_0201B43C
.public sub_020519D0
.public IsLevelResetDungeon
.public ov29_022EA418
.public sub_0200A2CC
.public ov29_022E7CFC
.public ov10_022C09E8
.public ov29_022E7EC4
.public sub_02051EF0
.public sub_02063830
.public ov29_022FA750
.public ResetGravity
.public ov29_022F7EAC
.public ov29_022ECDE4
.public sub_02057E90
.public ov29_0234CB88
.public ov29_0233A15C
.public ov10_022BDAB0
.public ov29_0233665C
.public ov29_023350FC
.public ov29_022E9FC0
.public FreeLoadedAttackSpriteAndMore
.public ov29_02346A64
.public LoadScriptVariableValue
.public ov29_02338A4C
.public ov29_023362EC
.public IsSecretBazaarVeneer
.public sub_0200A2F4
.public ChangeGiratinaFormIfSkyDungeon
.public ClearHiddenStairs
.public CloseFixedBin
.public CountItemsOnFloorForAcuteSniffer
.public DebugPrint0
.public DeleteAllMonsterSpriteFiles
.public DetermineAllTilesWalkableNeighbors
.public DIRECTIONS_XY
.public DisplayMessage
.public DisplayMessage2
.public DungeonGoesUp
.public DungeonRandInt
.public DungeonRngUnsetSecondary
.public EnemyEvolution
.public ov29_022E0F6C
.public ov29_022E1604
.public ov29_022E1A84
.public ov29_022FE2E4
.public ov29_02338F38
.public ov29_022EAF48
.public ov29_022FC9C0
.public IsRoomIlluminated
.public ov29_022F7E34
.public ov29_023534E0
.public sub_02063770
.public ov29_022F6E40
.public ov29_0234B09C
.public ov29_0234B010
.public ov10_022BDBB0
.public ov29_0233785C
.public ov29_02334D58
.public ov29_02349188
.public ov29_022E3A58
.public ov10_022C0F6C
.public sub_0201BD1C
.public sub_0201E380
.public EntityIsValid__022E0354
.public FadeToBlack
.public FIXED_ROOM_REVISIT_OVERRIDES
.public FreeLoadedAttackSpriteAndMore
.public GenerateDungeonRngSeed
.public GenerateFloor
.public GetApparentWeather
.public ov29_02338F68
.public ov29_0234BA54
.public GetBgRegionArea
.public GetDefaultTileTextureId
.public GetDungeonGenInfoUnk0C
.public GetDungeonMode
.public GetDungeonRngPreseed
.public GetFloorType
.public GetForcedLossReason
.public GetLeader
.public GetMaxReachedFloor
.public GetMaxRescueAttempts
.public GetTurnLimit
.public HandleSir0Translation
.public IncrementNbSteals
.public InitDungeonRng
.public InitEnemySpawnStats
.public IsBackgroundTileset
.public IsBossFight
.public IsFloorOver
.public IsIqEnabled
.public IsLevelResetDungeon
.public IsRoomIlluminated
.public IsSecretBazaarVeneer
.public IsTrapInvisibleWhenAttacking
.public LoadFileFromRom
.public LoadMappaFileAttributes
.public LoadScriptVariableValue
.public MemAlloc
.public MemFree
.public MemZero
.public OpenFixedBin
.public ov10_022BDAB0
.public ov10_022BDB54
.public ov10_022BDB60
.public ov10_022BDB80
.public ov10_022BDBA4
.public ov10_022BDBB0
.public ov10_022BDC0C
.public ov10_022BFE6C
.public ov10_022C0814
.public ov10_022C096C
.public ov10_022C0998
.public ov10_022C09E8
.public ov10_022C0CE0
.public ov10_022C0F6C
.public ov10_022C11D8
.public ov10_022C13B4
.public ov10_022C14D0
.public ov10_022C159C
.public ov10_022C16D8
.public ov10_022C22A0
.public ov29_022E0434
.public ov29_022E081C
.public ov29_022E0DFC
.public ov29_022E0E44
.public ov29_022E0F6C
.public ov29_022E12F8
.public ov29_022E1304
.public ov29_022E1550
.public ov29_022E15C8
.public ov29_022E1604
.public ov29_022E1640
.public ov29_022E1A84
.public ov29_022E2B68
.public ov29_022E2DFC
.public ov29_022E34B0
.public ov29_022E3A58
.public ov29_022E5F20
.public ov29_022E6E40
.public ov29_022E6F94
.public ov29_022E7CFC
.public ov29_022E7EC4
.public ov29_022E7F44
.public ov29_022E7F7C
.public ov29_022E8104
.public ov29_022E8708
.public ov29_022E8BFC
.public ov29_022E9F18
.public ov29_022E9FC0
.public ov29_022EA370
.public ov29_022EA3F8
.public ov29_022EA418
.public ov29_022EA428
.public ov29_022EAD68
.public ov29_022EAEAC
.public ov29_022EAF34
.public ov29_022EAF48
.public ov29_022ECDE4
.public ov29_022ECF44
.public ov29_022ECF78
.public ov29_022ECFB8
.public ov29_022ED030
.public ov29_022ED0B0
.public ov29_022ED888
.public ov29_022EF738
.public ov29_022EF8A4
.public ov29_022EF9B8
.public ov29_022F62CC
.public ov29_022F6E40
.public ov29_022F6EF4
.public ov29_022F7104
.public ov29_022F7130
.public ov29_022F7308
.public ov29_022F7910
.public ov29_022F7BF4
.public ov29_022F7E34
.public ov29_022F7EAC
.public ov29_022F9970
.public ov29_022FA2F0
.public ov29_022FA418
.public ov29_022FA524
.public ov29_022FA648
.public ov29_022FA750
.public ov29_022FAA58
.public ov29_022FACBC
.public ov29_022FAD4C
.public ov29_022FAF08
.public ov29_022FBB1C
.public ov29_022FC9C0
.public ov29_022FCD04
.public ov29_022FDFA4
.public ov29_022FE2E4
.public ov29_022FE4A8
.public ov29_02304B64
.public ov29_02305814
.public ov29_0231AFB4
.public ov29_0231B39C
.public ov29_0231B460
.public ov29_02334D58
.public ov29_02334DA8
.public ov29_02335044
.public ov29_023350FC
.public ov29_023359F8
.public ov29_023362EC
.public ov29_02336460
.public ov29_023365B8
.public ov29_023365E8
.public ov29_0233665C
.public ov29_023369F8
.public ov29_0233781C
.public ov29_0233785C
.public ov29_0233845C
.public ov29_0233873C
.public ov29_02338868
.public ov29_02338898
.public ov29_023388B0
.public ov29_023389C4
.public ov29_02338A4C
.public ov29_02338D30
.public ov29_02338F10
.public ov29_02338F38
.public ov29_02338F48
.public ov29_02338F68
.public ov29_02338FC8
.public ov29_0233904C
.public ov29_02339F88
.public ov29_02339FD0
.public ov29_0233A0E8
.public ov29_0233A15C
.public ov29_0233A1BC
.public ov29_0233A248
.public ov29_02343980
.public ov29_02344C4C
.public ov29_02345D84
.public ov29_023469E0
.public ov29_02346A64
.public ov29_02346DA4
.public ov29_02346E48
.public ov29_023480FC
.public ov29_023482D4
.public ov29_023484A0
.public ov29_02348850
.public ov29_02348894
.public ov29_023488C8
.public ov29_02348918
.public ov29_02348994
.public sub_0206367C
.public ov29_022EF738
.public ov29_02346E48
.public MemFree
.public ov29_022FAA58
.public ov29_0234BB2C
.public GetDungeonGenInfoUnk0C
.public ov29_0234B04C
.public sub_02009194
.public ov29_023389C4
.public sub_0201BCCC
.public ov29_02353860
.public LoadFileFromRom
.public ov29_02304B64
.public ov10_022C0CE0
.public sub_020634F4
.public ov29_022E8BFC
.public ov29_022ED030
.public ov10_022C0814
.public sub_02052EFC
.public ov29_023482D4
.public ov29_022E2DFC
.public ov29_0234BB38
.public ov29_022FACBC
.public ov29_022FA418
.public ov29_022E0434
.public TrySpawnDoughSeedPoke
.public ov29_02345D84
.public ov29_02349188
.public ov29_02349658
.public ov29_02349C84
.public ov29_0234AFA4
.public GetForcedLossReason
.public ov29_023369F8
.public ov29_02338FC8
.public ov29_02348850
.public ov29_023365E8
.public DungeonGoesUp
.public sub_020091B0
.public sub_020275C0
.public ov29_023388B0
.public ov10_022BDB54
.public ov29_022ECF44
.public ov29_0233781C
.public ov29_023365B8
.public ov29_022FA648
.public sub_0201BCF4
.public ov10_022BDBA4
.public GetMaxReachedFloor
.public ov29_022F7130
.public MemZero
.public DungeonRngUnsetSecondary
.public ClearHiddenStairs
.public ov10_022BDC0C
.public ov10_022C159C
.public HandleSir0Translation
.public sub_02051B44
.public ov29_0233A0E8
.public ov29_0234AFD0
.public ov29_022F7BF4
.public ov29_0233873C
.public IsBossFight
.public UpdateShouldBoostHiddenStairsSpawnChance
.public ov29_0234B010
.public ov29_0234B04C
.public ov29_0234B06C
.public ov29_0234B09C
.public ov29_0234B1A4
.public ov29_0234B4CC
.public ov29_0234BA18
.public ov29_0234BA54
.public ov29_0234BB10
.public ov29_0234BB20
.public ov29_0234BB2C
.public ov29_0234BB38
.public ov29_0234C584
.public ov29_0234C5EC
.public ov29_0234C654
.public ov29_0234C668
.public ov29_02334DA8
.public ov29_022F7308
.public ov29_0234C738
.public ov29_0234CA84
.public ov29_0234CB34
.public ov29_0234CB54
.public ov29_0234CB88
.public ov29_0234FD04
.public ov29_0234FD14
.public ov29_0234FD48
.public ov29_0234FD4C
.public ov29_0234FD50
.public ov29_0234FD54
.public ov29_02350F88
.public ov29_02350F8C
.public ov29_02350F90
.public ov29_0235109C
.public ov29_023510B8
.public ov29_023510BC
.public ov29_023510C0
.public ov29_023510C8
.public ov29_023534E0
.public ov29_023534E8
.public ov29_02353518
.public ov29_0235351C
.public ov29_02353524
.public ov29_0235352C
.public ov29_02353530
.public ov29_02353534
.public ov29_02353538
.public ov29_0235355C
.public ov29_02353563
.public ov29_02353860
.public ov29_023538B4
.public ov29_0236CEF0
.public ov29_0236D5EC
.public ov29_023735EC
.public ov29_023735F0
.public ov29_023735F4
.public ov29_023735F8
.public ov29_023735FC
.public ov29_0237360C
.public ov29_0237368C
.public ov29_02373690
.public ov29_0237C6D4
.public ov29_0237C714
.public Rand16Bit
.public RefillTeam
.public ResetGravity
.public RunFractionalTurn
.public SetBothScreensWindowColorToDefault
.public SetDungeonRngPreseed
.public SetDungeonRngPreseed23Bit
.public SetForcedLossReason
.public SetMaxReachedFloor
.public SetMinimapDataE447
.public SpawnInitialMonsters
.public SpawnShopkeepers
.public SpawnTeam
.public sub_01FF8130
.public sub_01FF81CC
.public sub_01FF8C60
.public sub_02001808
.public sub_02008BF4
.public sub_02009194
.public sub_020091B0
.public sub_0200A2CC
.public sub_0200A2F4
.public sub_0200A544
.public sub_0200B330
.public sub_0200B3D4
.public sub_02017B00
.public sub_0201B43C
.public sub_0201B9F8
.public sub_0201BAC8
.public sub_0201BCCC
.public sub_0201BCF4
.public sub_0201BD1C
.public sub_0201E050
.public ov29_022E5F20
.public ChangeGiratinaFormIfSkyDungeon
.public ov29_022EA370
.public ov29_022ECF78
.public ov29_022FDFA4
.public ov29_02346DA4
.public GetTurnLimit
.public IsTrapInvisibleWhenAttacking
.public sub_020510E8
.public ov29_02338898
.public sub_0201E380
.public sub_0201F598
.public sub_020275C0
.public sub_020275DC
.public sub_0204AEA0
.public GetDefaultTileTextureId
.public ov29_022EA3F8
.public sub_0204F1B4
.public sub_020510E8
.public sub_02051134
.public sub_020519D0
.public sub_02051B44
.public sub_02051C24
.public sub_02051D68
.public sub_02051DD0
.public sub_02051DFC
.public sub_02051E60
.public sub_02051ED4
.public sub_02051EF0
.public sub_02052EFC
.public sub_02057E90
.public sub_02057EF4
.public sub_02058644
.public sub_0205B77C
.public sub_020634F4
.public sub_02063504
.public sub_02063628
.public sub_0206367C
.public sub_02063734
.public sub_02063770
.public sub_02063830
.public TryActivateArtificialWeatherAbilities
.public TryActivateIqBooster
.public TryActivateSlowStart
.public TryActivateWeather
.public TryForcedLoss
.public TryInflictBurnStatusWholeTeam
.public TrySpawnDoughSeedPoke
.public UnloadFile
.public UpdateMinimap
.public UpdateShouldBoostHiddenStairsSpawnChance
.public UpdateShouldBoostKecleonShopSpawnChance
.public UpdateTrapsVisibility

1
asm/include/overlay_29_022E0378.inc
View File

@@ -73,3 +73,4 @@
.public sub_0201E380
.public sub_0201F598
.public sub_0204AE80
.public SECONDARY_TERRAIN_TYPES

28
asm/include/overlay_29_022E1A40.inc
View File

@@ -1,19 +1,22 @@
#pragma once
.public _020A1AE8
.public abs
.public CanSeeInvisibleMonsters
.public DrawMinimapTile
.public DungeonGetSpriteIndex
.public EntityIsValid__022E1A1C
.public EntityIsValid__022E32E8
.public GetMonsterApparentId
.public GetMonsterName
.public GetSleepAnimationId
.public DungeonGetSpriteIndex
.public GetSpriteSize
.public GetTileSafe
.public HasDropeyeStatus
.public HiddenStairsPresent
.public IsBlinded
.public IsPositionActuallyInSight
.public IsPositionInSight
.public ItemIsActive__022E330C
.public strcpy
.public StringFromMessageId
.public TeamMemberHasEnabledIqSkill
.public ov29_022DE954
.public ov29_022DE9F8
.public ov29_022DEA10
@@ -21,22 +24,25 @@
.public ov29_022E34C8
.public ov29_022E3534
.public ov29_022E3A58
.public IsPositionActuallyInSight
.public ov29_022ED82C
.public ov29_022EDF7C
.public GetMonsterApparentId
.public GetMonsterName
.public ov29_0230040C
.public ov29_023047DC
.public ov29_02304830
.public ov29_02304954
.public UpdateTrapsVisibility
.public ov29_0233711C
.public ov29_023372A4
.public HiddenStairsPresent
.public DrawMinimapTile
.public UpdateMinimap
.public ov29_02344BA8
.public ov29_0234B034
.public ov29_02353538
.public ov29_0237C754
.public ov29_0237C79C
.public ov29_0237C84C
.public SECONDARY_TERRAIN_TYPES
.public strcpy
.public StringFromMessageId
.public sub_02009194
.public sub_020091B0
.public TeamMemberHasEnabledIqSkill
.public UpdateMinimap
.public UpdateTrapsVisibility

13
asm/include/overlay_29_022E330C.inc
View File

@@ -1,7 +1,9 @@
#pragma once
.public AbilityIsActiveVeneer
.public AdvanceFrame
.public AnimationDelayOrSomething
.public AnimationHasMoreFrames
.public DisplayUi
.public EntityIsValid__022E37B8
.public GetEffectAnimationField0x19
.public GetTileSafe
@@ -12,11 +14,12 @@
.public ov10_022BF8E8
.public ov10_022BFD20
.public ov29_022E2C6C
.public UpdateCamera
.public AnimationDelayOrSomething
.public ov29_022E5ED0
.public DisplayUi
.public UpdateTrapsVisibility
.public UpdateMinimap
.public ov29_0235110C
.public ov29_02353538
.public ov29_0235354C
.public sub_0201C000
.public sub_0201CF90
.public UpdateCamera
.public UpdateMinimap
.public UpdateTrapsVisibility

87
asm/include/overlay_29_022E37DC.inc
View File

@@ -1,9 +1,16 @@
#pragma once
.public _020AFC4C
.public abs
.public AdvanceFrame
.public AnimationHasMoreFrames
.public CanMonsterSpawn
.public ChangeDungeonMusic
.public CheckActiveChallengeRequest
.public CheckSpawnThreshold
.public DIRECTIONS_XY
.public DungeonFloorToGroupFloor
.public DungeonGetSpriteIndex
.public DungeonGetTotalSpriteFileSize
.public DungeonGoesUp
.public DungeonRandInt
.public DungeonRngSetPrimary
@@ -24,30 +31,28 @@
.public GetSecondFormIfValid
.public GetSleepAnimationId
.public GetSpriteFileSize
.public DungeonGetSpriteIndex
.public GetSpriteSize
.public GetTile
.public GetVisibilityRange
.public HandleSir0Translation
.public InitPreprocessorArgs
.public IsBossFight
.public IsCurrentFixedRoomBossFight
.public IsCurrentMissionType
.public IsDestinationFloorWithFixedRoom
.public IsDestinationFloorWithMonster
.public IsDojoDungeon
.public IsFullFloorFixedRoom
.public IsInSpawnList
.public IsItemForSpecialSpawnInBag
.public LoadFileFromRom
.public LoadFixedRoom
.public LogMessageByIdWithPopup
.public MemAlloc
.public MemFree
.public MemZero
.public MonsterIsType
.public NeedsItemToSpawn
.public RandIntSafe
.public SetMinimapDataE447
.public SetMinimapDataE448
.public SetMonsterId
.public StringFromMessageId
.public SubstitutePlaceholderStringTags
.public UnloadFile
.public ov10_022BDC68
.public ov10_022BDE50
.public ov10_022BEC08
@@ -76,34 +81,21 @@
.public ov29_022DC77C
.public ov29_022DE5D8
.public ov29_022DE5F0
.public IsBossFight
.public IsCurrentFixedRoomBossFight
.public ShouldDisplayEntityWrapper
.public ov29_022E2CA0
.public GetVisibilityRange
.public PlayEffectAnimationEntity
.public ov29_022EA370
.public ov29_022EA718
.public ov29_022EACCC
.public ov29_022EACE4
.public ChangeDungeonMusic
.public ov29_022ED0F4
.public ov29_022F42D8
.public DungeonGetTotalSpriteFileSize
.public CheckSpawnThreshold
.public ov29_0230027C
.public ov29_023049A8
.public ov29_0230D618
.public IsInSpawnList
.public IsFullFloorFixedRoom
.public ov29_02339138
.public ov29_02339148
.public UpdateMinimap
.public ov29_02339D7C
.public ov29_0233A0E8
.public ov29_0233A1BC
.public LoadFixedRoom
.public CheckActiveChallengeRequest
.public ov29_02349378
.public ov29_0234B1A4
.public ov29_0234B4E0
@@ -113,6 +105,56 @@
.public ov29_0234F278
.public ov29_0234F290
.public ov29_0234F2B8
.public ov29_0235118C
.public ov29_02351194
.public ov29_0235119C
.public ov29_023511A4
.public ov29_023511B0
.public ov29_023511DC
.public ov29_0235122C
.public ov29_0235124C
.public ov29_02351464
.public ov29_02351584
.public ov29_02351594
.public ov29_023515B0
.public ov29_023515CC
.public ov29_023515E8
.public ov29_023515F4
.public ov29_02351604
.public ov29_0235352C
.public ov29_02353538
.public ov29_0235354C
.public ov29_02353554
.public ov29_02353558
.public ov29_0235355C
.public ov29_0237C850
.public ov29_0237C888
.public ov29_0237C88A
.public ov29_0237C88E
.public ov29_0237C890
.public ov29_0237C892
.public PlayEffectAnimationEntity
.public RandIntSafe
.public SetMinimapDataE447
.public SetMinimapDataE448
.public SetMonsterId
.public ShouldDisplayEntityWrapper
.public STATUS_ICON_ARRAY_BIDE
.public STATUS_ICON_ARRAY_BLINDED
.public STATUS_ICON_ARRAY_BURN
.public STATUS_ICON_ARRAY_CRINGE
.public STATUS_ICON_ARRAY_CURSE
.public STATUS_ICON_ARRAY_FREEZE
.public STATUS_ICON_ARRAY_INVISIBLE
.public STATUS_ICON_ARRAY_LEECH_SEED
.public STATUS_ICON_ARRAY_LONG_TOSS
.public STATUS_ICON_ARRAY_MAGNET_RISE
.public STATUS_ICON_ARRAY_MIRACLE_EYE
.public STATUS_ICON_ARRAY_MUZZLED
.public STATUS_ICON_ARRAY_REFLECT
.public STATUS_ICON_ARRAY_SLEEP
.public STATUS_ICON_ARRAY_SURE_SHOT
.public StringFromMessageId
.public sub_0200B330
.public sub_0200B3D4
.public sub_0201B9F8
@@ -129,3 +171,6 @@
.public sub_02048400
.public sub_0204AEA0
.public sub_0204AF58
.public SubstitutePlaceholderStringTags
.public UnloadFile
.public UpdateMinimap

1
asm/include/overlay_29_022F7388.inc
View File

@@ -208,3 +208,4 @@
.public sub_02058674
.public sub_02058EB0
.public sub_0205A450
.public SECONDARY_TERRAIN_TYPES

1
asm/include/overlay_29_02300108.inc
View File

@@ -69,3 +69,4 @@
.public sub_0205858C
.public sub_020585B4
.public sub_02058C9C
.public SECONDARY_TERRAIN_TYPES

1
asm/include/overlay_29_023047DC.inc
View File

@@ -37,3 +37,4 @@
.public SetAndPlayAnimationForAnimationControl
.public sub_0204AEE0
.public sub_02053038
.public SECONDARY_TERRAIN_TYPES

1
asm/include/overlay_29_023118D8.inc
View File

@@ -69,3 +69,4 @@
.public ov29_0234B0B4
.public sub_02025888
.public sub_020258E4
.public SECONDARY_TERRAIN_TYPES

1
asm/include/overlay_29_023350FC.inc
View File

@@ -59,3 +59,4 @@
.public sub_0204AED0
.public sub_02051D8C
.public sub_02051E60
.public SECONDARY_TERRAIN_TYPES

1
asm/include/overlay_29_02337CCC.inc
View File

@@ -129,3 +129,4 @@
.public sub_0204AEC0
.public sub_0204AF30
.public sub_02056880
.public SECONDARY_TERRAIN_TYPES

1
asm/include/overlay_29_023456BC.inc
View File

@@ -92,3 +92,4 @@
.public sub_0204F7A8
.public sub_02053D1C
.public sub_02057CE8
.public SECONDARY_TERRAIN_TYPES

42
asm/include/overlay_29_0234EC38.inc
View File

@@ -14,18 +14,37 @@
.public GetKeyboardStringResult
.public GetPerformanceFlagWithChecks
.public IsExperienceLocked
.public IsFullFloorFixedRoom
.public JoinedAtRangeCheck2
.public JoinedAtRangeCheck2Veneer
.public MemAlloc
.public MemFree
.public MemZero
.public OpenMessageLog
.public PreprocessString
.public ShowKeyboard
.public StoryRestrictionsEnabled
.public StringFromMessageId
.public StrncpySimple
.public StrncpySimpleNoPadSafe
.public OthersMenuLoop
.public ov10_022C4760
.public ov10_022C4814
.public ov10_022C48C4
.public ov10_022C48CC
.public ov10_022C48D4
.public ov10_022C48F4
.public ov10_022C490C
.public ov10_022C4918
.public ov10_022C4934
.public ov10_022C49E4
.public ov10_022C49F8
.public ov10_022C4A0C
.public ov10_022C4A20
.public ov10_022C4A34
.public ov10_022C4A48
.public ov10_022C4A70
.public ov10_022C4A88
.public ov10_022C4AA0
.public ov10_022C4AB8
.public ov10_022C4AD0
.public ov10_022C4AE8
.public ov10_022C4B00
.public ov10_022C4B98
.public ov29_022E8708
.public ov29_022E8768
.public ov29_022E87DC
@@ -37,7 +56,10 @@
.public ov29_022EA428
.public ov29_022F0C98
.public ov29_02300818
.public IsFullFloorFixedRoom
.public ov29_0230D704
.public ov29_0230D70C
.public ov29_0230D738
.public ov29_0230D76C
.public ov29_02347100
.public ov29_0234DD90
.public ov29_0234DDA0
@@ -59,6 +81,12 @@
.public ov31_02388714
.public ov31_02388E88
.public ov31_0238941C
.public PreprocessString
.public ShowKeyboard
.public StoryRestrictionsEnabled
.public StringFromMessageId
.public StrncpySimple
.public StrncpySimpleNoPadSafe
.public sub_0200B3D4
.public sub_02026214
.public sub_020282F4

4
asm/include/overlay_31.inc
View File

@@ -14,7 +14,7 @@
.public GetItemInfo
.public ov29_0234EBCC
.public UpdateMapSurveyorFlag
.public ov00_022BCCF4
.public ov10_022BCCF4
.public Arm9LoadUnkFieldNa0x2029EC8
.public GetMaxPp
.public SpecificRecruitCheck
@@ -73,7 +73,7 @@
.public ov29_022EB9A0
.public ov29_022E1620
.public sub_0203F9CC
.public ov00_022BCD10
.public ov10_022BCD10
.public ov00_022E2A78
.public ItemZInit
.public CanAiUseMove

27
asm/main_0200C4CC.s
View File

@@ -169883,7 +169883,10 @@ _020A0C6E:
.byte 0xD0, 0x07, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x0A, 0x30, 0x04, 0x00, 0xD0, 0x07, 0x00, 0x00
.global _020A1864
_020A1864:
.byte 0xB4, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00
.byte 0xB4, 0x00, 0x00, 0x00
.global _020A1868
_020A1868:
.byte 0x32, 0x00, 0x00, 0x00
.global SPECIAL_BAND_STAT_BOOST
SPECIAL_BAND_STAT_BOOST:
.byte 0x0C, 0x00, 0x00, 0x00
@@ -169933,18 +169936,34 @@ WONDER_GUMMI_STAT_BOOST:
.byte 0x03, 0x00, 0x00, 0x00
.global ZINC_BAND_STAT_BOOST
ZINC_BAND_STAT_BOOST:
.byte 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x00, 0x00
.global EGG_HP_BONUS
EGG_HP_BONUS:
.byte 0x0A, 0x00, 0x00, 0x00
.global _020A18BC
_020A18BC:
.byte 0x78, 0x05, 0x00, 0x00
.global _020A18C0
_020A18C0:
.byte 0x2C, 0x01, 0x00, 0x00
.global EVOLUTION_HP_BONUS
EVOLUTION_HP_BONUS:
.byte 0x0A, 0x00, 0x00, 0x00
.global _020A18C8
_020A18C8:
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00
.byte 0x00, 0xC9, 0xFE, 0xFF, 0x00, 0x08, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00
.global EVOLUTION_PHYSICAL_STAT_BONUSES
EVOLUTION_PHYSICAL_STAT_BONUSES:
.byte 0x05, 0x00, 0x05, 0x00
.byte 0x00, 0xC9, 0xFE, 0xFF, 0x00, 0x08, 0x00, 0x00
.global EGG_STAT_BONUSES
EGG_STAT_BONUSES:
.byte 0x05, 0x00, 0x05, 0x00
.global _020A18E0
_020A18E0:
.byte 0x05, 0x00, 0x05, 0x00
.global EVOLUTION_SPECIAL_STAT_BONUSES
EVOLUTION_SPECIAL_STAT_BONUSES:
.byte 0x05, 0x00, 0x05, 0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF
.byte 0x99, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00
.global _020A18FC

94
asm/overlay_10.s
View File

@@ -9165,7 +9165,10 @@ ov10_022C4404:
.byte 0x04, 0x00, 0x08, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x0C, 0x00
.byte 0x0F, 0x00, 0x14, 0x00, 0x0A, 0x00, 0x0E, 0x00, 0x50, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0C, 0x00
.byte 0xCC, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0xB3, 0x01, 0x00, 0x00, 0x06, 0x00, 0x0C, 0x00
.byte 0x03, 0x00, 0x05, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00, 0x49, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x05, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0A, 0x00
.global ov10_022C4760
ov10_022C4760:
.byte 0x49, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x10, 0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x0A, 0x00, 0x20, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x0A, 0x00, 0x04, 0x00, 0x0A, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x04, 0x00, 0x0A, 0x00
.byte 0x03, 0x00, 0x09, 0x00, 0x03, 0x00, 0x05, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x0A, 0x00, 0x0C, 0x00
@@ -9177,6 +9180,8 @@ ov10_022C4404:
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x04, 0x00, 0x80, 0x01, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x78, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0xB5, 0x00, 0x00, 0x00
.global ov10_022C4814
ov10_022C4814:
.byte 0x44, 0x00, 0x00, 0x00, 0x66, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
.byte 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0A, 0x00, 0x0A, 0x00
.byte 0x32, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00
@@ -9188,13 +9193,30 @@ ov10_022C4404:
.byte 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00
.byte 0x00, 0x02, 0x00, 0x00, 0x0F, 0x00, 0x1E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
.byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C48C4
ov10_022C48C4:
.byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C48CC
ov10_022C48CC:
.byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C48D4
ov10_022C48D4:
.byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0D, 0x01, 0x03, 0x06, 0x01, 0x06
.byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00, 0x00, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00
.global ov10_022C48F4
ov10_022C48F4:
.byte 0x7C, 0x05, 0x79, 0x05, 0x7A, 0x05, 0x7B, 0x05, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x14, 0x00
.byte 0x1E, 0x00, 0x28, 0x00, 0x32, 0x00, 0x00, 0x00, 0x47, 0x00, 0x4D, 0x00, 0x49, 0x00, 0x79, 0x05
.byte 0x88, 0x00, 0x00, 0x00, 0x47, 0x00, 0x4D, 0x00, 0x7A, 0x05, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00
.byte 0x1E, 0x00, 0x28, 0x00, 0x32, 0x00, 0x00, 0x00
.global ov10_022C490C
ov10_022C490C:
.byte 0x47, 0x00, 0x4D, 0x00, 0x49, 0x00, 0x79, 0x05
.byte 0x88, 0x00, 0x00, 0x00
.global ov10_022C4918
ov10_022C4918:
.byte 0x47, 0x00, 0x4D, 0x00, 0x7A, 0x05, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x19, 0x00, 0x1E, 0x00, 0x23, 0x00, 0x28, 0x00, 0x00, 0x00
.global ov10_022C4934
ov10_022C4934:
.byte 0x4D, 0x00, 0x47, 0x00, 0x7B, 0x05, 0x49, 0x00, 0x88, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
.byte 0x32, 0x00, 0x50, 0x00, 0x14, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x0A, 0x00, 0x01, 0x00
@@ -9206,24 +9228,61 @@ ov10_022C4404:
.byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
.byte 0x19, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00
.global ov10_022C49E4
ov10_022C49E4:
.byte 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00
.byte 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00
.byte 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x45, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov10_022C49F8
ov10_022C49F8:
.byte 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00
.byte 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C4A0C
ov10_022C4A0C:
.byte 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00
.byte 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C4A20
ov10_022C4A20:
.byte 0x49, 0x00, 0x45, 0x00
.byte 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C4A34
ov10_022C4A34:
.byte 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov10_022C4A48
ov10_022C4A48:
.byte 0x49, 0x00, 0x45, 0x00, 0x49, 0x00, 0x45, 0x00, 0x78, 0x00, 0x79, 0x00
.byte 0x7A, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.global ov10_022C4A70
ov10_022C4A70:
.byte 0x49, 0x00, 0x49, 0x00
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00
.byte 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov10_022C4A88
ov10_022C4A88:
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00
.byte 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C4AA0
ov10_022C4AA0:
.byte 0x49, 0x00, 0x49, 0x00
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00, 0x7F, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00
.byte 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov10_022C4AB8
ov10_022C4AB8:
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00
.byte 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C4AD0
ov10_022C4AD0:
.byte 0x49, 0x00, 0x49, 0x00
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00, 0x7F, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00
.byte 0x83, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov10_022C4AE8
ov10_022C4AE8:
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00
.byte 0x83, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov10_022C4B00
ov10_022C4B00:
.byte 0x49, 0x00, 0x49, 0x00
.byte 0x49, 0x00, 0x49, 0x00, 0x49, 0x00, 0x47, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00
@@ -9233,7 +9292,10 @@ ov10_022C4404:
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
.byte 0x4A, 0x00, 0x4B, 0x00, 0x4C, 0x00, 0x4F, 0x00, 0x53, 0x00, 0x54, 0x00, 0x56, 0x00, 0x5B, 0x00
.byte 0x57, 0x00, 0x5C, 0x00, 0x5E, 0x00, 0x5F, 0x00, 0x6F, 0x00, 0x68, 0x00, 0x6B, 0x00, 0x75, 0x00
.byte 0x71, 0x00, 0x00, 0x00, 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00
.byte 0x71, 0x00, 0x00, 0x00
.global ov10_022C4B98
ov10_022C4B98:
.byte 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00
.byte 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00, 0x80, 0x00, 0x81, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00
.byte 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x0C, 0x00, 0x1E, 0x00
.byte 0x32, 0x00, 0x46, 0x00, 0x5A, 0x00, 0x6E, 0x00, 0x82, 0x00, 0x96, 0x00, 0xAA, 0x00, 0xBE, 0x00

12390
asm/overlay_11.s
View File

File diff suppressed because it is too large Load Diff

4
asm/overlay_13.s
View File

@@ -78,7 +78,7 @@ _0238A1E4: ; jump table
b _0238A350 ; case 18
b _0238A558 ; case 19
_0238A234:
bl ov00_022E6E68
bl ov11_022E6E68
ldr r0, _0238A570 ; =ov13_0238CEA0
mov r1, #0xd
ldr r0, [r0]
@@ -925,7 +925,7 @@ _0238AE20:
_0238AE68:
mov r1, #0x13
strb r1, [r0]
bl ov00_0230D71C
bl ov11_0230D71C
b _0238BD74
_0238AE78:
mov r1, #4

135
asm/overlay_15.s
View File

@@ -242,7 +242,7 @@ ov15_0238A468: ; 0x0238A468
bl ov15_0238A4E8
b _0238A4D4
_0238A488:
ldr r0, _0238A4E4 ; =0x0238B0CC
ldr r0, _0238A4E4 ; =ov15_0238B0CC
bl DebugPrint0
ldr r0, _0238A4DC ; =ov15_0238B180
ldr r0, [r0]
@@ -269,7 +269,7 @@ _0238A4D4:
.align 2, 0
_0238A4DC: .word ov15_0238B180
_0238A4E0: .word 0x00001308
_0238A4E4: .word 0x0238B0CC
_0238A4E4: .word ov15_0238B0CC
arm_func_end ov15_0238A468
arm_func_start ov15_0238A4E8
@@ -316,7 +316,7 @@ _0238A56C:
beq _0238A5CC
tst r1, #0x80
beq _0238A5CC
ldr r0, _0238AD18 ; =0x0238B0D4
ldr r0, _0238AD18 ; =ov15_0238B0D4
and r1, r1, #0x1f
strb r1, [r3, #0x68]
bl DebugPrint0
@@ -363,7 +363,7 @@ _0238A608:
bl ShowMessageInDBox
b _0238AD08
_0238A634:
ldr r0, _0238AD24 ; =0x0238B08C
ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
ldr r1, _0238AD10 ; =ov15_0238B180
@@ -372,21 +372,21 @@ _0238A634:
ldr r0, [r1]
ldrsb r0, [r0, #0x80]
bl ShowDBox
ldr r0, _0238AD2C ; =0x0238B0E0
ldr r0, _0238AD2C ; =ov15_0238B0E0
bl DebugPrint0
mov r1, #4
ldr r0, _0238AD30 ; =0x0238B0AC
ldr r0, _0238AD30 ; =BANK_D_BOX_LAYOUT_4
str r1, [sp]
ldr r1, _0238AD34 ; =0x00300013
mov r2, #0
ldr r3, _0238AD38 ; =0x0238B054
ldr r3, _0238AD38 ; =BANK_MAIN_MENU
bl CreateNormalMenu
ldr r1, _0238AD10 ; =ov15_0238B180
ldr r1, [r1]
strb r0, [r1, #0x83]
b _0238AD08
_0238A68C:
ldr r0, _0238AD3C ; =0x0238B0E8
ldr r0, _0238AD3C ; =ov15_0238B0E8
bl DebugPrint0
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
@@ -418,7 +418,7 @@ _0238A68C:
bl ShowMessageInDBox
b _0238AD08
_0238A708:
ldr r0, _0238AD3C ; =0x0238B0E8
ldr r0, _0238AD3C ; =ov15_0238B0E8
mov r1, #6
str r1, [r3, #8]
bl DebugPrint0
@@ -461,7 +461,7 @@ _0238A790:
bl ShowMessageInDBox
b _0238AD08
_0238A7AC:
ldr r0, _0238AD4C ; =0x0238B0F4
ldr r0, _0238AD4C ; =ov15_0238B0F4
bl DebugPrint0
ldr r0, _0238AD10 ; =ov15_0238B180
mov r2, #1
@@ -491,7 +491,7 @@ _0238A7AC:
bl ShowMessageInDBox
b _0238AD08
_0238A820:
ldr r0, _0238AD3C ; =0x0238B0E8
ldr r0, _0238AD3C ; =ov15_0238B0E8
bl DebugPrint0
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
@@ -582,7 +582,7 @@ _0238A95C:
mov ip, #0x50
str r0, [r2, #0x58]
ldr r2, [r1]
ldr r0, _0238AD5C ; =0x0238B10C
ldr r0, _0238AD5C ; =ov15_0238B10C
str r3, [r2, #0x5c]
ldr r3, [r1]
mov r2, #0x12
@@ -592,7 +592,7 @@ _0238A95C:
ldr r1, [r1]
str r2, [r1, #0x78]
bl DebugPrint0
ldr r0, _0238AD24 ; =0x0238B08C
ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
ldr r1, _0238AD10 ; =ov15_0238B180
@@ -601,7 +601,7 @@ _0238A95C:
ldr r1, _0238AD60 ; =0x00001017
strb r0, [r3, #0x82]
str r2, [sp]
ldr r0, _0238AD64 ; =0x0238B09C
ldr r0, _0238AD64 ; =BANK_D_BOX_LAYOUT_3
ldr r3, _0238AD68 ; =ov15_0238AE6C
str r2, [sp, #4]
bl sub_020305B4
@@ -651,7 +651,7 @@ _0238AA08:
bl ShowMessageInDBox
b _0238AD08
_0238AA88:
ldr r0, _0238AD3C ; =0x0238B0E8
ldr r0, _0238AD3C ; =ov15_0238B0E8
bl DebugPrint0
ldr r0, _0238AD10 ; =ov15_0238B180
ldr r0, [r0]
@@ -746,7 +746,7 @@ _0238ABD4:
mov ip, #0x50
str r0, [r2, #0x58]
ldr r2, [r1]
ldr r0, _0238AD74 ; =0x0238B114
ldr r0, _0238AD74 ; =ov15_0238B114
str r3, [r2, #0x5c]
ldr r3, [r1]
mov r2, #0x12
@@ -756,7 +756,7 @@ _0238ABD4:
ldr r1, [r1]
str r2, [r1, #0x78]
bl DebugPrint0
ldr r0, _0238AD24 ; =0x0238B08C
ldr r0, _0238AD24 ; =BANK_D_BOX_LAYOUT_2
ldr r1, _0238AD28 ; =ov15_0238ADC4
bl sub_0202F8C4
ldr r1, _0238AD10 ; =ov15_0238B180
@@ -765,7 +765,7 @@ _0238ABD4:
ldr r1, _0238AD60 ; =0x00001017
strb r0, [r3, #0x82]
str r2, [sp]
ldr r0, _0238AD64 ; =0x0238B09C
ldr r0, _0238AD64 ; =BANK_D_BOX_LAYOUT_3
ldr r3, _0238AD68 ; =ov15_0238AE6C
str r2, [sp, #4]
bl sub_020305B4
@@ -823,30 +823,30 @@ _0238AD08:
.align 2, 0
_0238AD10: .word ov15_0238B180
_0238AD14: .word 0x00003008
_0238AD18: .word 0x0238B0D4
_0238AD18: .word ov15_0238B0D4
_0238AD1C: .word 0x00000376
_0238AD20: .word 0x00000377
_0238AD24: .word 0x0238B08C
_0238AD24: .word BANK_D_BOX_LAYOUT_2
_0238AD28: .word ov15_0238ADC4
_0238AD2C: .word 0x0238B0E0
_0238AD30: .word 0x0238B0AC
_0238AD2C: .word ov15_0238B0E0
_0238AD30: .word BANK_D_BOX_LAYOUT_4
_0238AD34: .word 0x00300013
_0238AD38: .word 0x0238B054
_0238AD3C: .word 0x0238B0E8
_0238AD38: .word BANK_MAIN_MENU
_0238AD3C: .word ov15_0238B0E8
_0238AD40: .word 0x00003018
_0238AD44: .word 0x00000379
_0238AD48: .word 0x0000037A
_0238AD4C: .word 0x0238B0F4
_0238AD4C: .word ov15_0238B0F4
_0238AD50: .word 0x0000037B
_0238AD54: .word 0x0098967F
_0238AD58: .word 0x0000037E
_0238AD5C: .word 0x0238B10C
_0238AD5C: .word ov15_0238B10C
_0238AD60: .word 0x00001017
_0238AD64: .word 0x0238B09C
_0238AD64: .word BANK_D_BOX_LAYOUT_3
_0238AD68: .word ov15_0238AE6C
_0238AD6C: .word 0x0001869F
_0238AD70: .word 0x00000382
_0238AD74: .word 0x0238B114
_0238AD74: .word ov15_0238B114
arm_func_end ov15_0238A4E8
arm_func_start ov15_0238AD78
@@ -955,7 +955,7 @@ ov15_0238AE98: ; 0x0238AE98
mvn r0, #1
cmp r1, r0
beq _0238AEC4
ldr r0, _0238AF44 ; =0x0238B11C
ldr r0, _0238AF44 ; =ov15_0238B11C
bl DebugPrint0
_0238AEC4:
ldr r1, _0238AF40 ; =ov15_0238B180
@@ -964,7 +964,7 @@ _0238AEC4:
ldrsb r1, [r1, #0x82]
cmp r1, r0
beq _0238AEE4
ldr r0, _0238AF48 ; =0x0238B12C
ldr r0, _0238AF48 ; =ov15_0238B12C
bl DebugPrint0
_0238AEE4:
ldr r1, _0238AF40 ; =ov15_0238B180
@@ -973,7 +973,7 @@ _0238AEE4:
ldrsb r1, [r1, #0x83]
cmp r1, r0
beq _0238AF04
ldr r0, _0238AF4C ; =0x0238B13C
ldr r0, _0238AF4C ; =ov15_0238B13C
bl DebugPrint0
_0238AF04:
ldr r1, _0238AF40 ; =ov15_0238B180
@@ -982,7 +982,7 @@ _0238AF04:
ldrsb r1, [r1, #0x84]
cmp r1, r0
beq _0238AF24
ldr r0, _0238AF50 ; =0x0238B150
ldr r0, _0238AF50 ; =ov15_0238B150
bl DebugPrint0
_0238AF24:
ldr r0, _0238AF40 ; =ov15_0238B180
@@ -994,10 +994,10 @@ _0238AF24:
ldmia sp!, {r3, pc}
.align 2, 0
_0238AF40: .word ov15_0238B180
_0238AF44: .word 0x0238B11C
_0238AF48: .word 0x0238B12C
_0238AF4C: .word 0x0238B13C
_0238AF50: .word 0x0238B150
_0238AF44: .word ov15_0238B11C
_0238AF48: .word ov15_0238B12C
_0238AF4C: .word ov15_0238B13C
_0238AF50: .word ov15_0238B150
arm_func_end ov15_0238AE98
; 0x0238AF54
@@ -1017,22 +1017,63 @@ _0238AF50: .word 0x0238B150
.byte 0x00, 0x20, 0x90, 0xE5, 0x05, 0x10, 0x43, 0xE2, 0x00, 0x30, 0x82, 0xE5, 0x00, 0x00, 0x90, 0xE5
.byte 0x80, 0x10, 0xC0, 0xE5, 0x02, 0x00, 0x00, 0xEA, 0x89, 0x6F, 0xFD, 0xEB, 0x04, 0x00, 0xA0, 0xE3
.byte 0x08, 0x80, 0xBD, 0xE8, 0x01, 0x00, 0xA0, 0xE3, 0x08, 0x80, 0xBD, 0xE8, 0x80, 0xB1, 0x38, 0x02
.global BANK_MAIN_MENU
BANK_MAIN_MENU:
.byte 0x6F, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x71, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x72, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x1E, 0x05
.byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x1C, 0x03
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x08, 0x0B, 0x07
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
.byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global BANK_D_BOX_LAYOUT_2
BANK_D_BOX_LAYOUT_2:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x1C, 0x03
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global BANK_D_BOX_LAYOUT_3
BANK_D_BOX_LAYOUT_3:
.byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x08, 0x0B, 0x07
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global BANK_D_BOX_LAYOUT_4
BANK_D_BOX_LAYOUT_4:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x05
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00
.byte 0x52, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x2D, 0x4F, 0x70
.byte 0x65, 0x6E, 0x0A, 0x00, 0x53, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov15_0238B0CC
ov15_0238B0CC:
.byte 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00
.global ov15_0238B0D4
ov15_0238B0D4:
.byte 0x52, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00
.global ov15_0238B0E0
ov15_0238B0E0:
.byte 0x4D, 0x2D, 0x4F, 0x70
.byte 0x65, 0x6E, 0x0A, 0x00
.global ov15_0238B0E8
ov15_0238B0E8:
.byte 0x53, 0x2D, 0x43, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00
.global ov15_0238B0F4
ov15_0238B0F4:
.byte 0x4D, 0x65, 0x6E, 0x75, 0x5F, 0x42, 0x61, 0x6E, 0x6B, 0x5F, 0x4D, 0x6F, 0x64, 0x65, 0x5F, 0x43
.byte 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00, 0x00, 0x50, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00
.byte 0x47, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00, 0x6D, 0x65, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20
.byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x73, 0x75, 0x62, 0x20, 0x6E, 0x6F, 0x74, 0x20
.byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x20, 0x6E
.byte 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x70, 0x75
.byte 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x0A, 0x00, 0x00
.global ov15_0238B10C
ov15_0238B10C:
.byte 0x50, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00
.global ov15_0238B114
ov15_0238B114:
.byte 0x47, 0x2D, 0x4F, 0x70, 0x65, 0x6E, 0x0A, 0x00
.global ov15_0238B11C
ov15_0238B11C:
.byte 0x6D, 0x65, 0x73, 0x20, 0x6E, 0x6F, 0x74, 0x20
.byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00
.global ov15_0238B12C
ov15_0238B12C:
.byte 0x73, 0x75, 0x62, 0x20, 0x6E, 0x6F, 0x74, 0x20
.byte 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00
.global ov15_0238B13C
ov15_0238B13C:
.byte 0x73, 0x65, 0x6C, 0x65, 0x63, 0x74, 0x20, 0x6E
.byte 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00
.global ov15_0238B150
ov15_0238B150:
.byte 0x49, 0x6E, 0x70, 0x75
.byte 0x74, 0x20, 0x6E, 0x6F, 0x74, 0x20, 0x63, 0x6C, 0x6F, 0x73, 0x65, 0x0A, 0x00, 0x00, 0x00, 0x00
.data

145
asm/overlay_16.s
View File

@@ -130,10 +130,10 @@ _0238A2D8:
bl ShowMessageInDBox
b _0238B0C4
_0238A318:
ldr r0, _0238B0D8 ; =0x0238CDE4
ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6
mov r4, #3
ldr r1, _0238B0DC ; =0x00300011
ldr r3, _0238B0E0 ; =0x0238CD40
ldr r3, _0238B0E0 ; =EVO_MAIN_MENU
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -282,9 +282,9 @@ _0238A50C:
mov r4, #2
str r1, [r0, #0x74]
ldr r0, _0238B0CC ; =ov16_0238CE40
ldr r3, _0238B0EC ; =0x0238CD08
ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM
ldr r1, [r0]
ldr r0, _0238B0D8 ; =0x0238CDE4
ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6
str r4, [r1, #0x78]
ldr r1, _0238B0F0 ; =0x00300013
mov r2, #0
@@ -326,9 +326,9 @@ _0238A5D8:
ldr r0, [r1]
mov r4, #2
str r4, [r0, #0x78]
ldr r0, _0238B0D8 ; =0x0238CDE4
ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6
ldr r1, _0238B0F0 ; =0x00300013
ldr r3, _0238B0EC ; =0x0238CD08
ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -337,9 +337,9 @@ _0238A5D8:
strb r0, [r1, #0xc3]
b _0238B0C4
_0238A614:
ldr r0, _0238B0F8 ; =0x0238CDD4
ldr r0, _0238B0F8 ; =EVO_D_BOX_LAYOUT_5
mov r4, #3
ldr r3, _0238B0FC ; =0x0238CD20
ldr r3, _0238B0FC ; =EVO_SUBMENU
mov r1, #0x13
mov r2, #0
str r4, [sp]
@@ -401,9 +401,9 @@ _0238A6F4:
ldr r0, [r1]
mov r4, #2
str r4, [r0, #0x78]
ldr r0, _0238B0D8 ; =0x0238CDE4
ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6
ldr r1, _0238B0F0 ; =0x00300013
ldr r3, _0238B0EC ; =0x0238CD08
ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -579,9 +579,9 @@ _0238A95C:
mov r4, #2
str r1, [r0, #0x74]
ldr r0, _0238B0CC ; =ov16_0238CE40
ldr r3, _0238B0EC ; =0x0238CD08
ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM
ldr r1, [r0]
ldr r0, _0238B0D8 ; =0x0238CDE4
ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6
str r4, [r1, #0x78]
ldr r1, _0238B0F0 ; =0x00300013
mov r2, #0
@@ -740,7 +740,7 @@ _0238AB9C:
strh r1, [r0, #8]
_0238ABF4:
ldr r1, _0238B0CC ; =ov16_0238CE40
ldr r0, _0238B114 ; =0x020A18C4
ldr r0, _0238B114 ; =EVOLUTION_HP_BONUS
ldr r3, [r1]
ldrsh r2, [r0]
ldr r4, [r3, #0x3c]
@@ -749,13 +749,13 @@ _0238ABF4:
add r2, r3, r2
strh r2, [r4, #0xa]
ldr r1, [r1]
ldr r3, _0238B11C ; =0x020A18D0
ldr r3, _0238B11C ; =EVOLUTION_PHYSICAL_STAT_BONUSES
ldr r2, [r1, #0x3c]
ldrsh r1, [r2, #0xa]
cmp r1, r0
strgth r0, [r2, #0xa]
ldr r1, _0238B0CC ; =ov16_0238CE40
ldr r0, _0238B120 ; =0x020A18E4
ldr r0, _0238B120 ; =EVOLUTION_SPECIAL_STAT_BONUSES
ldr r1, [r1]
ldrsh r5, [r0]
ldr r1, [r1, #0x3c]
@@ -1020,9 +1020,9 @@ _0238AFF8:
str r2, [r0, #0x74]
ldr r2, [r1]
mov ip, #4
ldr r0, _0238B0D8 ; =0x0238CDE4
ldr r0, _0238B0D8 ; =EVO_D_BOX_LAYOUT_6
ldr r1, _0238B0DC ; =0x00300011
ldr r3, _0238B0EC ; =0x0238CD08
ldr r3, _0238B0EC ; =EVO_MENU_CONFIRM
str ip, [r2, #0x78]
mov ip, #2
mov r2, #0
@@ -1061,7 +1061,7 @@ _0238B088:
str r0, [sp, #0x9c]
str ip, [sp]
mov ip, #4
ldr r0, _0238B13C ; =0x0238CDC4
ldr r0, _0238B13C ; =EVO_D_BOX_LAYOUT_4
ldr r1, _0238B140 ; =0x00009813
ldr r3, _0238B144 ; =ov16_0238CB30
add r2, sp, #0x90
@@ -1077,32 +1077,32 @@ _0238B0C4:
_0238B0CC: .word ov16_0238CE40
_0238B0D0: .word 0x00000431
_0238B0D4: .word 0x00000432
_0238B0D8: .word 0x0238CDE4
_0238B0D8: .word EVO_D_BOX_LAYOUT_6
_0238B0DC: .word 0x00300011
_0238B0E0: .word 0x0238CD40
_0238B0E0: .word EVO_MAIN_MENU
_0238B0E4: .word 0x00000442
_0238B0E8: .word 0x00000449
_0238B0EC: .word 0x0238CD08
_0238B0EC: .word EVO_MENU_CONFIRM
_0238B0F0: .word 0x00300013
_0238B0F4: .word 0x00000434
_0238B0F8: .word 0x0238CDD4
_0238B0FC: .word 0x0238CD20
_0238B0F8: .word EVO_D_BOX_LAYOUT_5
_0238B0FC: .word EVO_SUBMENU
_0238B100: .word 0x00000125
_0238B104: .word 0x0000043E
_0238B108: .word 0x0000043A
_0238B10C: .word 0x0000043C
_0238B110: .word 0x0000140F
_0238B114: .word 0x020A18C4
_0238B114: .word EVOLUTION_HP_BONUS
_0238B118: .word 0x000003E7
_0238B11C: .word 0x020A18D0
_0238B120: .word 0x020A18E4
_0238B11C: .word EVOLUTION_PHYSICAL_STAT_BONUSES
_0238B120: .word EVOLUTION_SPECIAL_STAT_BONUSES
_0238B124: .word 0x00003F01
_0238B128: .word 0x0000043F
_0238B12C: .word 0x0000042D
_0238B130: .word 0x00000433
_0238B134: .word 0x00000447
_0238B138: .word 0x00000446
_0238B13C: .word 0x0238CDC4
_0238B13C: .word EVO_D_BOX_LAYOUT_4
_0238B140: .word 0x00009813
_0238B144: .word ov16_0238CB30
arm_func_end ov16_0238ADFC
@@ -1232,10 +1232,10 @@ _0238B2D8:
bl ShowMessageInDBox
b _0238C0C4
_0238B318:
ldr r0, _0238C0D8 ; =0x0238CDE4
ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6
mov r4, #3
ldr r1, _0238C0DC ; =0x00300011
ldr r3, _0238C0E0 ; =0x0238CD40
ldr r3, _0238C0E0 ; =EVO_MAIN_MENU
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1380,9 +1380,9 @@ _0238B50C:
mov r4, #2
str r1, [r0, #0x74]
ldr r0, _0238C0CC ; =ov16_0238CE40
ldr r3, _0238C0EC ; =0x0238CD08
ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM
ldr r1, [r0]
ldr r0, _0238C0D8 ; =0x0238CDE4
ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6
str r4, [r1, #0x78]
ldr r1, _0238C0F0 ; =0x00300013
mov r2, #0
@@ -1424,9 +1424,9 @@ _0238B5D8:
ldr r0, [r1]
mov r4, #2
str r4, [r0, #0x78]
ldr r0, _0238C0D8 ; =0x0238CDE4
ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6
ldr r1, _0238C0F0 ; =0x00300013
ldr r3, _0238C0EC ; =0x0238CD08
ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1435,9 +1435,9 @@ _0238B5D8:
strb r0, [r1, #0xc3]
b _0238C0C4
_0238B614:
ldr r0, _0238C0F8 ; =0x0238CDD4
ldr r0, _0238C0F8 ; =EVO_D_BOX_LAYOUT_5
mov r4, #3
ldr r3, _0238C0FC ; =0x0238CD20
ldr r3, _0238C0FC ; =EVO_SUBMENU
mov r1, #0x13
mov r2, #0
str r4, [sp]
@@ -1499,9 +1499,9 @@ _0238B6F4:
ldr r0, [r1]
mov r4, #2
str r4, [r0, #0x78]
ldr r0, _0238C0D8 ; =0x0238CDE4
ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6
ldr r1, _0238C0F0 ; =0x00300013
ldr r3, _0238C0EC ; =0x0238CD08
ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1677,9 +1677,9 @@ _0238B95C:
mov r4, #2
str r1, [r0, #0x74]
ldr r0, _0238C0CC ; =ov16_0238CE40
ldr r3, _0238C0EC ; =0x0238CD08
ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM
ldr r1, [r0]
ldr r0, _0238C0D8 ; =0x0238CDE4
ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6
str r4, [r1, #0x78]
ldr r1, _0238C0F0 ; =0x00300013
mov r2, #0
@@ -1838,7 +1838,7 @@ _0238BB9C:
strh r1, [r0, #8]
_0238BBF4:
ldr r1, _0238C0CC ; =ov16_0238CE40
ldr r0, _0238C114 ; =0x020A18C4
ldr r0, _0238C114 ; =EVOLUTION_HP_BONUS
ldr r3, [r1]
ldrsh r2, [r0]
ldr r4, [r3, #0x3c]
@@ -1847,13 +1847,13 @@ _0238BBF4:
add r2, r3, r2
strh r2, [r4, #0xa]
ldr r1, [r1]
ldr r3, _0238C11C ; =0x020A18D0
ldr r3, _0238C11C ; =EVOLUTION_PHYSICAL_STAT_BONUSES
ldr r2, [r1, #0x3c]
ldrsh r1, [r2, #0xa]
cmp r1, r0
strgth r0, [r2, #0xa]
ldr r1, _0238C0CC ; =ov16_0238CE40
ldr r0, _0238C120 ; =0x020A18E4
ldr r0, _0238C120 ; =EVOLUTION_SPECIAL_STAT_BONUSES
ldr r1, [r1]
ldrsh r5, [r0]
ldr r1, [r1, #0x3c]
@@ -2114,9 +2114,9 @@ _0238BFF8:
str r2, [r0, #0x74]
ldr r2, [r1]
mov ip, #4
ldr r0, _0238C0D8 ; =0x0238CDE4
ldr r0, _0238C0D8 ; =EVO_D_BOX_LAYOUT_6
ldr r1, _0238C0DC ; =0x00300011
ldr r3, _0238C0EC ; =0x0238CD08
ldr r3, _0238C0EC ; =EVO_MENU_CONFIRM
str ip, [r2, #0x78]
mov ip, #2
mov r2, #0
@@ -2155,7 +2155,7 @@ _0238C088:
str r0, [sp, #0x24]
str ip, [sp]
mov ip, #4
ldr r0, _0238C13C ; =0x0238CDC4
ldr r0, _0238C13C ; =EVO_D_BOX_LAYOUT_4
ldr r1, _0238C140 ; =0x00009813
ldr r3, _0238C144 ; =ov16_0238CB30
add r2, sp, #0x18
@@ -2171,32 +2171,32 @@ _0238C0C4:
_0238C0CC: .word ov16_0238CE40
_0238C0D0: .word 0x00000431
_0238C0D4: .word 0x00000432
_0238C0D8: .word 0x0238CDE4
_0238C0D8: .word EVO_D_BOX_LAYOUT_6
_0238C0DC: .word 0x00300011
_0238C0E0: .word 0x0238CD40
_0238C0E0: .word EVO_MAIN_MENU
_0238C0E4: .word 0x00000442
_0238C0E8: .word 0x00000449
_0238C0EC: .word 0x0238CD08
_0238C0EC: .word EVO_MENU_CONFIRM
_0238C0F0: .word 0x00300013
_0238C0F4: .word 0x00000434
_0238C0F8: .word 0x0238CDD4
_0238C0FC: .word 0x0238CD20
_0238C0F8: .word EVO_D_BOX_LAYOUT_5
_0238C0FC: .word EVO_SUBMENU
_0238C100: .word 0x00000125
_0238C104: .word 0x0000043E
_0238C108: .word 0x0000043A
_0238C10C: .word 0x0000043C
_0238C110: .word 0x0000140F
_0238C114: .word 0x020A18C4
_0238C114: .word EVOLUTION_HP_BONUS
_0238C118: .word 0x000003E7
_0238C11C: .word 0x020A18D0
_0238C120: .word 0x020A18E4
_0238C11C: .word EVOLUTION_PHYSICAL_STAT_BONUSES
_0238C120: .word EVOLUTION_SPECIAL_STAT_BONUSES
_0238C124: .word 0x00003F01
_0238C128: .word 0x0000043F
_0238C12C: .word 0x0000042D
_0238C130: .word 0x00000433
_0238C134: .word 0x00000447
_0238C138: .word 0x00000446
_0238C13C: .word 0x0238CDC4
_0238C13C: .word EVO_D_BOX_LAYOUT_4
_0238C140: .word 0x00009813
_0238C144: .word ov16_0238CB30
arm_func_end ov16_0238B148
@@ -2431,7 +2431,7 @@ ov16_0238CB30: ; 0x0238CB30
ldr r2, _0238CB8C ; =ov16_0238CE40
ldr r3, _0238CB90 ; =0x0000C402
ldr r6, [r2]
ldr r2, _0238CB94 ; =0x0238CE28
ldr r2, _0238CB94 ; =ov16_0238CE28
add r5, r6, r1, lsl #2
ldr r1, [r5, #0x50]
add ip, sp, #4
@@ -2452,7 +2452,7 @@ ov16_0238CB30: ; 0x0238CB30
.align 2, 0
_0238CB8C: .word ov16_0238CE40
_0238CB90: .word 0x0000C402
_0238CB94: .word 0x0238CE28
_0238CB94: .word ov16_0238CE28
arm_func_end ov16_0238CB30
arm_func_start ov16_0238CB98
@@ -2479,7 +2479,7 @@ ov16_0238CBD0: ; 0x0238CBD0
stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
sub sp, sp, #0x3c
bl sub_02059B08
ldr r1, _0238CC5C ; =0x020B0A48
ldr r1, _0238CC5C ; =TEAM_MEMBER_TABLE_PTR
mov r6, #0
ldr r8, [r1]
ldr sb, _0238CC60 ; =0x0000022B
@@ -2515,7 +2515,7 @@ _0238CC40:
add sp, sp, #0x3c
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0238CC5C: .word 0x020B0A48
_0238CC5C: .word TEAM_MEMBER_TABLE_PTR
_0238CC60: .word 0x0000022B
arm_func_end ov16_0238CBD0
@@ -2591,10 +2591,18 @@ _0238CD04: .word ov16_0238CE40
arm_func_end ov16_0238CCF0
; 0x0238CD08
.global EVO_MENU_CONFIRM
EVO_MENU_CONFIRM:
.byte 0x2B, 0x04, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x35, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global EVO_SUBMENU
EVO_SUBMENU:
.byte 0x35, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x36, 0x04, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x37, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2E, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global EVO_MAIN_MENU
EVO_MAIN_MENU:
.byte 0x2E, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x2F, 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x30, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x04, 0x2E, 0x04, 0x2F, 0x04, 0x30, 0x04
.byte 0x31, 0x04, 0x32, 0x04, 0x33, 0x04, 0x34, 0x04, 0x38, 0x04, 0x39, 0x04, 0x3A, 0x04, 0x3C, 0x04
@@ -2602,13 +2610,24 @@ _0238CD04: .word ov16_0238CE40
.byte 0x45, 0x04, 0x46, 0x04, 0x47, 0x04, 0x48, 0x04, 0x49, 0x04, 0x3B, 0x04, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x12, 0x10, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x0A, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global EVO_D_BOX_LAYOUT_4
EVO_D_BOX_LAYOUT_4:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global EVO_D_BOX_LAYOUT_5
EVO_D_BOX_LAYOUT_5:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global EVO_D_BOX_LAYOUT_6
EVO_D_BOX_LAYOUT_6:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x14, 0x10, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x65, 0x6E, 0x75
.byte 0x4D, 0x6F, 0x6E, 0x73, 0x74, 0x65, 0x72, 0x50, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x42, 0x6F
.byte 0x6F, 0x6B, 0x5F, 0x49, 0x73, 0x42, 0x75, 0x73, 0x79, 0x20, 0x62, 0x75, 0x73, 0x79, 0x0A, 0x00
.global ov16_0238CE28
ov16_0238CE28:
.byte 0x5B, 0x6B, 0x69, 0x6E, 0x64, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00
.data

198
asm/overlay_17.s
View File

@@ -26,7 +26,7 @@ ov17_0238A140: ; 0x0238A140
sub r1, r2, #1
str r2, [r0, #0x70]
ldr r5, [lr]
ldr ip, _0238A274 ; =0x0238A08C
ldr ip, _0238A274 ; =ov11_0238A08C
ldr r3, [r5, #0x70]
sub r0, r4, #4
str r3, [r5, #0x78]
@@ -83,7 +83,7 @@ ov17_0238A140: ; 0x0238A140
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0238A270: .word ov17_0238BE00
_0238A274: .word 0x0238A08C
_0238A274: .word ov11_0238A08C
arm_func_end ov17_0238A140
arm_func_start ov17_0238A278
@@ -457,7 +457,7 @@ _0238A778: ; jump table
b _0238AF4C ; case 2
b _0238AF90 ; case 3
_0238A788:
ldr r7, _0238AFA0 ; =0x0238BD44
ldr r7, _0238AFA0 ; =OVERLAY17_FUNCTION_POINTER_TABLE
add r6, sp, #4
mov r5, #0xa
_0238A794:
@@ -522,7 +522,7 @@ _0238A840:
cmp r1, r0
ldr r4, _0238AFA4 ; =0x00003008
bne _0238A898
ldr r0, _0238AFA8 ; =0x0238BB64
ldr r0, _0238AFA8 ; =ASSEMBLY_D_BOX_LAYOUT_4
bl CreateDBox
ldr r1, _0238AF9C ; =ov17_0238BE00
mov r2, #0
@@ -693,10 +693,10 @@ _0238AABC:
mvn r0, #1
cmp r1, r0
bne _0238AB04
ldr r0, _0238AFE4 ; =0x0238BB34
ldr r0, _0238AFE4 ; =ASSEMBLY_D_BOX_LAYOUT_1
mov r2, #0
ldr r1, _0238AFE8 ; =0x00300013
ldr r3, _0238AFEC ; =0x0238BBB4
ldr r3, _0238AFEC ; =ASSEMBLY_MAIN_MENU_2
str r2, [sp]
bl CreateNormalMenu
ldr r1, _0238AF9C ; =ov17_0238BE00
@@ -717,9 +717,9 @@ _0238AB04:
mov r0, #0
str r0, [sp]
ldr r2, [r1]
ldr r0, _0238AFF0 ; =0x0238BB54
ldr r0, _0238AFF0 ; =ASSEMBLY_D_BOX_LAYOUT_3
ldr r1, _0238AFF4 ; =0x00300033
ldr r3, _0238AFF8 ; =0x0238BB84
ldr r3, _0238AFF8 ; =ASSEMBLY_MENU_CONFIRM
add r2, r2, #0x1b4
bl CreateNormalMenu
ldr r1, _0238AF9C ; =ov17_0238BE00
@@ -758,7 +758,7 @@ _0238AB94:
mov r0, r6
bl sub_020564B0
cmp r0, #0
ldrne r7, _0238AFFC ; =0x0238BBD4
ldrne r7, _0238AFFC ; =ASSEMBLY_SUBMENU_1
bne _0238ACEC
mov r0, r6
bl IsMainCharacter
@@ -791,20 +791,20 @@ _0238AC28:
cmp r8, #0
beq _0238AC5C
cmp r7, #0
ldrne r7, _0238B000 ; =0x0238BCCC
ldreq r7, _0238B004 ; =0x0238BC2C
ldrne r7, _0238B000 ; =ASSEMBLY_SUBMENU_6
ldreq r7, _0238B004 ; =ASSEMBLY_SUBMENU_3
b _0238ACEC
_0238AC5C:
cmp r5, #0
beq _0238AC74
cmp r7, #0
ldrne r7, _0238B000 ; =0x0238BCCC
ldreq r7, _0238B004 ; =0x0238BC2C
ldrne r7, _0238B000 ; =ASSEMBLY_SUBMENU_6
ldreq r7, _0238B004 ; =ASSEMBLY_SUBMENU_3
b _0238ACEC
_0238AC74:
cmp r7, #0
ldrne r7, _0238B008 ; =0x0238BD04
ldreq r7, _0238B00C ; =0x0238BC94
ldrne r7, _0238B008 ; =ASSEMBLY_SUBMENU_7
ldreq r7, _0238B00C ; =ASSEMBLY_SUBMENU_5
b _0238ACEC
_0238AC84:
cmp r8, #0
@@ -820,23 +820,23 @@ _0238ACA4:
cmp r6, r0
bne _0238ACC0
cmp r7, #0
ldrne r7, _0238B010 ; =0x0238BBFC
ldreq r7, _0238B004 ; =0x0238BC2C
ldrne r7, _0238B010 ; =ASSEMBLY_SUBMENU_2
ldreq r7, _0238B004 ; =ASSEMBLY_SUBMENU_3
b _0238ACEC
_0238ACC0:
ldr r7, _0238AFFC ; =0x0238BBD4
ldr r7, _0238AFFC ; =ASSEMBLY_SUBMENU_1
b _0238ACEC
_0238ACC8:
cmp r5, #0
beq _0238ACE0
cmp r7, #0
ldrne r7, _0238B010 ; =0x0238BBFC
ldreq r7, _0238B004 ; =0x0238BC2C
ldrne r7, _0238B010 ; =ASSEMBLY_SUBMENU_2
ldreq r7, _0238B004 ; =ASSEMBLY_SUBMENU_3
b _0238ACEC
_0238ACE0:
cmp r7, #0
ldrne r7, _0238B014 ; =0x0238BC5C
ldreq r7, _0238B00C ; =0x0238BC94
ldrne r7, _0238B014 ; =ASSEMBLY_SUBMENU_4
ldreq r7, _0238B00C ; =ASSEMBLY_SUBMENU_5
_0238ACEC:
mov r8, #0
mov r4, r8
@@ -872,7 +872,7 @@ _0238AD54:
ldr r1, _0238AF9C ; =ov17_0238BE00
mov r2, #0
ldr r4, [r1]
ldr r0, _0238B018 ; =0x0238BB44
ldr r0, _0238B018 ; =ASSEMBLY_D_BOX_LAYOUT_2
add r3, r4, #0x24c
str r3, [r4, #0x17c]
str r2, [sp]
@@ -957,9 +957,9 @@ _0238AE6C:
mvn r0, #1
cmp r1, r0
bne _0238AEB4
ldr r0, _0238B020 ; =0x0238BB74
ldr r0, _0238B020 ; =ASSEMBLY_D_BOX_LAYOUT_5
mov r2, #0
ldr r3, _0238B024 ; =0x0238BB9C
ldr r3, _0238B024 ; =ASSEMBLY_MAIN_MENU_1
mov r1, #0x13
str r2, [sp]
bl CreateNormalMenu
@@ -1026,7 +1026,7 @@ _0238AF4C:
blx r2
b _0238AF88
_0238AF84:
bl ov00_022E6E68
bl ov11_022E6E68
_0238AF88:
mov r0, #4
b _0238AF94
@@ -1037,9 +1037,9 @@ _0238AF94:
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0238AF9C: .word ov17_0238BE00
_0238AFA0: .word 0x0238BD44
_0238AFA0: .word OVERLAY17_FUNCTION_POINTER_TABLE
_0238AFA4: .word 0x00003008
_0238AFA8: .word 0x0238BB64
_0238AFA8: .word ASSEMBLY_D_BOX_LAYOUT_4
_0238AFAC: .word 0x0000041E
_0238AFB0: .word 0x0000041F
_0238AFB4: .word 0x00000425
@@ -1054,23 +1054,23 @@ _0238AFD4: .word 0x00000423
_0238AFD8: .word 0x00000424
_0238AFDC: .word 0x0000042A
_0238AFE0: .word 0x00000186
_0238AFE4: .word 0x0238BB34
_0238AFE4: .word ASSEMBLY_D_BOX_LAYOUT_1
_0238AFE8: .word 0x00300013
_0238AFEC: .word 0x0238BBB4
_0238AFF0: .word 0x0238BB54
_0238AFEC: .word ASSEMBLY_MAIN_MENU_2
_0238AFF0: .word ASSEMBLY_D_BOX_LAYOUT_3
_0238AFF4: .word 0x00300033
_0238AFF8: .word 0x0238BB84
_0238AFFC: .word 0x0238BBD4
_0238B000: .word 0x0238BCCC
_0238B004: .word 0x0238BC2C
_0238B008: .word 0x0238BD04
_0238B00C: .word 0x0238BC94
_0238B010: .word 0x0238BBFC
_0238B014: .word 0x0238BC5C
_0238B018: .word 0x0238BB44
_0238AFF8: .word ASSEMBLY_MENU_CONFIRM
_0238AFFC: .word ASSEMBLY_SUBMENU_1
_0238B000: .word ASSEMBLY_SUBMENU_6
_0238B004: .word ASSEMBLY_SUBMENU_3
_0238B008: .word ASSEMBLY_SUBMENU_7
_0238B00C: .word ASSEMBLY_SUBMENU_5
_0238B010: .word ASSEMBLY_SUBMENU_2
_0238B014: .word ASSEMBLY_SUBMENU_4
_0238B018: .word ASSEMBLY_D_BOX_LAYOUT_2
_0238B01C: .word 0x00000213
_0238B020: .word 0x0238BB74
_0238B024: .word 0x0238BB9C
_0238B020: .word ASSEMBLY_D_BOX_LAYOUT_5
_0238B024: .word ASSEMBLY_MAIN_MENU_1
arm_func_end ov17_0238ADFC
arm_func_start ov17_0238B028
@@ -1413,7 +1413,7 @@ _0238B3F8:
mov sl, #0
ldr r6, _0238B4CC ; =ov17_0238BE00
ldr r4, _0238B4D0 ; =0x0000022B
ldr r7, _0238B4D4 ; =0x020B0A48
ldr r7, _0238B4D4 ; =TEAM_MEMBER_TABLE_PTR
mov r8, sl
mov sb, #1
mov r5, #0x44
@@ -1474,7 +1474,7 @@ _0238B4BC:
.align 2, 0
_0238B4CC: .word ov17_0238BE00
_0238B4D0: .word 0x0000022B
_0238B4D4: .word 0x020B0A48
_0238B4D4: .word TEAM_MEMBER_TABLE_PTR
arm_func_end ov17_0238B390
arm_func_start ov17_0238B4D8
@@ -1868,7 +1868,7 @@ _0238B95C: .word ov17_0238BE00
ov17_0238B960: ; 0x0238B960
stmdb sp!, {r3, lr}
ldr r1, _0238B9AC ; =ov17_0238BE00
ldr r0, _0238B9B0 ; =0x020B0A48
ldr r0, _0238B9B0 ; =TEAM_MEMBER_TABLE_PTR
ldr r2, [r1]
ldr r1, [r0]
add r0, r2, #0x200
@@ -1887,7 +1887,7 @@ ov17_0238B960: ; 0x0238B960
ldmia sp!, {r3, pc}
.align 2, 0
_0238B9AC: .word ov17_0238BE00
_0238B9B0: .word 0x020B0A48
_0238B9B0: .word TEAM_MEMBER_TABLE_PTR
arm_func_end ov17_0238B960
arm_func_start ov17_0238B9B4
@@ -1960,51 +1960,110 @@ _0238BA7C: .word ov17_0238BE00
arm_func_end ov17_0238B9FC
; 0x0238BA80
.global ov17_0238BA80
ov17_0238BA80:
.byte 0x08, 0x40, 0x2D, 0xE9, 0xAB, 0xD0, 0xF2, 0xEB, 0x34, 0x10, 0x9F, 0xE5, 0x00, 0x10, 0x91, 0xE5
.byte 0x64, 0x02, 0x81, 0xE5, 0x7E, 0xD5, 0xF2, 0xEB, 0x24, 0x20, 0x9F, 0xE5, 0x01, 0xCC, 0xA0, 0xE3
.byte 0x00, 0x10, 0x92, 0xE5, 0x27, 0x30, 0xA0, 0xE3, 0x02, 0x1C, 0x81, 0xE2, 0xB8, 0x06, 0xC1, 0xE1
.byte 0x00, 0x00, 0x92, 0xE5, 0xBE, 0xC7, 0xC0, 0xE1, 0x00, 0x00, 0x92, 0xE5, 0x78, 0x30, 0x80, 0xE5
.byte 0x08, 0x80, 0xBD, 0xE8, 0x00, 0xBE, 0x38, 0x02, 0x08, 0x40, 0x2D, 0xE9, 0xD1, 0xD7, 0xF2, 0xEB
.byte 0x08, 0x80, 0xBD, 0xE8, 0x00, 0xBE, 0x38, 0x02
.global ov17_0238BAC8
ov17_0238BAC8:
.byte 0x08, 0x40, 0x2D, 0xE9, 0xD1, 0xD7, 0xF2, 0xEB
.byte 0x00, 0x00, 0x50, 0xE3, 0x08, 0x80, 0xBD, 0x08, 0x20, 0x00, 0xA0, 0xE3, 0x51, 0xFD, 0xFF, 0xEB
.byte 0x08, 0x80, 0xBD, 0xE8, 0x2C, 0x10, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x00, 0x91, 0xE5
.byte 0x08, 0x80, 0xBD, 0xE8
.global ov17_0238BAE4
ov17_0238BAE4:
.byte 0x2C, 0x10, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x00, 0x91, 0xE5
.byte 0x29, 0x20, 0xA0, 0xE3, 0xBE, 0x37, 0xC0, 0xE1, 0x00, 0x30, 0x91, 0xE5, 0x02, 0x0C, 0x83, 0xE2
.byte 0xF8, 0x05, 0xD0, 0xE1, 0x02, 0x08, 0x80, 0xE3, 0x0C, 0x00, 0x83, 0xE5, 0x00, 0x00, 0x91, 0xE5
.byte 0x78, 0x20, 0x80, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1, 0x00, 0xBE, 0x38, 0x02, 0x0C, 0x00, 0x9F, 0xE5
.byte 0x78, 0x20, 0x80, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1, 0x00, 0xBE, 0x38, 0x02
.global ov17_0238BB1C
ov17_0238BB1C:
.byte 0x0C, 0x00, 0x9F, 0xE5
.byte 0x0C, 0x10, 0xA0, 0xE3, 0x00, 0x00, 0x90, 0xE5, 0x78, 0x10, 0x80, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1
.byte 0x00, 0xBE, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x08, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFD, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x11, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x04, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00
.byte 0x00, 0xBE, 0x38, 0x02
.global ASSEMBLY_D_BOX_LAYOUT_1
ASSEMBLY_D_BOX_LAYOUT_1:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ASSEMBLY_D_BOX_LAYOUT_2
ASSEMBLY_D_BOX_LAYOUT_2:
.byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ASSEMBLY_D_BOX_LAYOUT_3
ASSEMBLY_D_BOX_LAYOUT_3:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x08, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ASSEMBLY_D_BOX_LAYOUT_4
ASSEMBLY_D_BOX_LAYOUT_4:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05, 0x00, 0xFD, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ASSEMBLY_D_BOX_LAYOUT_5
ASSEMBLY_D_BOX_LAYOUT_5:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFE, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ASSEMBLY_MENU_CONFIRM
ASSEMBLY_MENU_CONFIRM:
.byte 0x11, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x04, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global ASSEMBLY_MAIN_MENU_1
ASSEMBLY_MAIN_MENU_1:
.byte 0x14, 0x04, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x15, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x13, 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.global ASSEMBLY_MAIN_MENU_2
ASSEMBLY_MAIN_MENU_2:
.byte 0x13, 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x04, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x15, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_1
ASSEMBLY_SUBMENU_1:
.byte 0x1A, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_2
ASSEMBLY_SUBMENU_2:
.byte 0x18, 0x04, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x17, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_3
ASSEMBLY_SUBMENU_3:
.byte 0x17, 0x04, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_4
ASSEMBLY_SUBMENU_4:
.byte 0x18, 0x04, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x19, 0x04, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00
.byte 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00
.byte 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x17, 0x04, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x19, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_5
ASSEMBLY_SUBMENU_5:
.byte 0x17, 0x04, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x19, 0x04, 0x00, 0x00
.byte 0x08, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x16, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_6
ASSEMBLY_SUBMENU_6:
.byte 0x16, 0x04, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00
.byte 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00
.byte 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x16, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00
.global ASSEMBLY_SUBMENU_7
ASSEMBLY_SUBMENU_7:
.byte 0x16, 0x04, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x19, 0x04, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1A, 0x04, 0x00, 0x00
.byte 0x09, 0x00, 0x00, 0x00, 0x1B, 0x04, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1C, 0x04, 0x00, 0x00
.byte 0x0B, 0x00, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x48, 0xB0, 0x38, 0x02, 0x7C, 0xB0, 0x38, 0x02, 0xB4, 0xB0, 0x38, 0x02
.byte 0x0C, 0x00, 0x00, 0x00
.global OVERLAY17_FUNCTION_POINTER_TABLE
OVERLAY17_FUNCTION_POINTER_TABLE:
.byte 0x48, 0xB0, 0x38, 0x02, 0x7C, 0xB0, 0x38, 0x02, 0xB4, 0xB0, 0x38, 0x02
.byte 0x0C, 0xB1, 0x38, 0x02, 0x94, 0xB1, 0x38, 0x02, 0xB8, 0xB1, 0x38, 0x02, 0xE8, 0xB1, 0x38, 0x02
.byte 0x0C, 0xB2, 0x38, 0x02, 0x24, 0xB2, 0x38, 0x02, 0x3C, 0xB2, 0x38, 0x02, 0x60, 0xB2, 0x38, 0x02
.byte 0x78, 0xB2, 0x38, 0x02, 0x90, 0xB2, 0x38, 0x02, 0xB4, 0xB2, 0x38, 0x02, 0x6C, 0xB3, 0x38, 0x02
@@ -2013,9 +2072,12 @@ _0238BA7C: .word ov17_0238BE00
.byte 0xAC, 0xB6, 0x38, 0x02, 0xDC, 0xB6, 0x38, 0x02, 0x14, 0xB7, 0x38, 0x02, 0x38, 0xB7, 0x38, 0x02
.byte 0xA8, 0xB7, 0x38, 0x02, 0xCC, 0xB7, 0x38, 0x02, 0x54, 0xB8, 0x38, 0x02, 0x7C, 0xB8, 0x38, 0x02
.byte 0xA0, 0xB8, 0x38, 0x02, 0xD4, 0xB8, 0x38, 0x02, 0xF8, 0xB8, 0x38, 0x02, 0x60, 0xB9, 0x38, 0x02
.byte 0xB4, 0xB9, 0x38, 0x02, 0xD8, 0xB9, 0x38, 0x02, 0xFC, 0xB9, 0x38, 0x02, 0x80, 0xBA, 0x38, 0x02
.byte 0xC8, 0xBA, 0x38, 0x02, 0xE4, 0xBA, 0x38, 0x02, 0x1C, 0xBB, 0x38, 0x02
.byte 0xB4, 0xB9, 0x38, 0x02, 0xD8, 0xB9, 0x38, 0x02, 0xFC, 0xB9, 0x38, 0x02
.word ov17_0238BA80
.word ov17_0238BAC8
.word ov17_0238BAE4
.word ov17_0238BB1C
.data
.global ov17_0238BE00
ov17_0238BE00:

233
asm/overlay_18.s
View File

@@ -51,7 +51,7 @@ ov18_0238A140: ; 0x0238A140
strh r1, [r0, #0x8c]
bl sub_020573A0
bl sub_02041400
ldr r1, _0238A29C ; =0x0238A090
ldr r1, _0238A29C ; =ov11_0238A090
ldr r0, _0238A298 ; =ov18_0238D620
ldr r3, [r1]
ldr r2, [r0]
@@ -93,7 +93,7 @@ ov18_0238A140: ; 0x0238A140
ldmia sp!, {r3, pc}
.align 2, 0
_0238A298: .word ov18_0238D620
_0238A29C: .word 0x0238A090
_0238A29C: .word ov11_0238A090
arm_func_end ov18_0238A140
arm_func_start ov18_0238A2A0
@@ -748,7 +748,7 @@ _0238ABAC: .word 0x0000021F
ov18_0238ABB0: ; 0x0238ABB0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
sub sp, sp, #0x58
ldr r2, _0238ACDC ; =0x020B0A48
ldr r2, _0238ACDC ; =TEAM_MEMBER_TABLE_PTR
mov r1, #0x44
ldr r2, [r2]
mov r3, #0
@@ -829,7 +829,7 @@ _0238ACD4:
add sp, sp, #0x58
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0238ACDC: .word 0x020B0A48
_0238ACDC: .word TEAM_MEMBER_TABLE_PTR
_0238ACE0: .word 0x00000216
arm_func_end ov18_0238ABB0
@@ -894,7 +894,7 @@ _0238ADA4: .word 0x0000021F
ov18_0238ADA8: ; 0x0238ADA8
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, lr}
sub sp, sp, #0x5c
ldr r3, _0238AEE8 ; =0x020B0A48
ldr r3, _0238AEE8 ; =TEAM_MEMBER_TABLE_PTR
mov r2, #0x44
ldr r3, [r3]
mov r4, r1
@@ -984,7 +984,7 @@ _0238AEE0:
add sp, sp, #0x5c
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
_0238AEE8: .word 0x020B0A48
_0238AEE8: .word TEAM_MEMBER_TABLE_PTR
_0238AEEC: .word 0x00000216
arm_func_end ov18_0238ADFC
@@ -1001,7 +1001,7 @@ ov18_0238AEF0: ; 0x0238AEF0
bl ov18_0238ADA8
bl GetMoveName
mov r3, r0
ldr r1, _0238AF38 ; =0x0238D5F8
ldr r1, _0238AF38 ; =ov18_0238D5F8
mov r0, r4
mov r2, #0x4d
bl ov18_0238AAC0
@@ -1009,7 +1009,7 @@ ov18_0238AEF0: ; 0x0238AEF0
ldmia sp!, {r4, pc}
.align 2, 0
_0238AF34: .word ov18_0238D620
_0238AF38: .word 0x0238D5F8
_0238AF38: .word ov18_0238D5F8
arm_func_end ov18_0238AEF0
arm_func_start ov18_0238AF3C
@@ -1028,7 +1028,7 @@ ov18_0238AF3C: ; 0x0238AF3C
subne r0, r0, #0x1f4
strne r0, [sp, #0x428]
add ip, ip, #4
ldr r2, _0238AFC8 ; =0x0238D608
ldr r2, _0238AFC8 ; =ov18_0238D608
ldr r3, _0238AFCC ; =0x0000C402
add r0, sp, #4
mov r1, #0x100
@@ -1050,7 +1050,7 @@ ov18_0238AF3C: ; 0x0238AF3C
add sp, sp, #0x400
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238AFC8: .word 0x0238D608
_0238AFC8: .word ov18_0238D608
_0238AFCC: .word 0x0000C402
_0238AFD0: .word 0x00000225
arm_func_end ov18_0238AF3C
@@ -1095,7 +1095,7 @@ _0238B03C: ; jump table
b _0238BD1C ; case 2
b _0238BD34 ; case 3
_0238B04C:
ldr ip, _0238BD44 ; =0x0238D4C8
ldr ip, _0238BD44 ; =OVERLAY18_FUNCTION_POINTER_TABLE
add r6, sp, #0x1c
mov r5, #0x13
_0238B058:
@@ -1157,7 +1157,7 @@ _0238B0FC:
ldr r4, _0238BD48 ; =0x00003008
cmp r1, r0
bne _0238B150
ldr r0, _0238BD4C ; =0x0238D310
ldr r0, _0238BD4C ; =OVERLAY18_D_BOX_LAYOUT_11
bl CreateDBox
ldr r1, _0238BD40 ; =ov18_0238D620
mvn r2, #0
@@ -1453,7 +1453,7 @@ _0238B530:
mvn r0, #1
cmp r1, r0
bne _0238B56C
ldr r0, _0238BDB0 ; =0x0238D270
ldr r0, _0238BDB0 ; =OVERLAY18_D_BOX_LAYOUT_1
ldr r1, _0238BDB4 ; =ov18_0238AF3C
bl sub_0202F8C4
ldr r1, _0238BD40 ; =ov18_0238D620
@@ -1469,10 +1469,10 @@ _0238B56C:
mvn r0, #1
cmp r1, r0
bne _0238B5B8
ldr r0, _0238BDB8 ; =0x0238D2F0
ldr r0, _0238BDB8 ; =OVERLAY18_D_BOX_LAYOUT_9
mov r4, #3
ldr r1, _0238BDBC ; =0x00300013
ldr r3, _0238BDC0 ; =0x0238D378
ldr r3, _0238BDC0 ; =MOVES_MAIN_MENU
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1489,10 +1489,10 @@ _0238B5B8:
mvn r0, #1
cmp r1, r0
bne _0238B604
ldr r0, _0238BDC4 ; =0x0238D2D0
ldr r0, _0238BDC4 ; =OVERLAY18_D_BOX_LAYOUT_7
mov r4, #4
ldr r1, _0238BDBC ; =0x00300013
ldr r3, _0238BDC8 ; =0x0238D398
ldr r3, _0238BDC8 ; =MOVES_SUBMENU_3
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1514,9 +1514,9 @@ _0238B604:
mov r0, #2
str r0, [sp]
ldr r2, [r1]
ldr r0, _0238BDCC ; =0x0238D280
ldr r0, _0238BDCC ; =OVERLAY18_D_BOX_LAYOUT_2
ldr r1, _0238BDD0 ; =0x00300033
ldr r3, _0238BDD4 ; =0x0238D320
ldr r3, _0238BDD4 ; =MOVES_MENU_CONFIRM
add r2, r2, #0x90
bl CreateNormalMenu
ldr r1, _0238BD40 ; =ov18_0238D620
@@ -1532,9 +1532,9 @@ _0238B65C:
mvn r0, #1
cmp r1, r0
bne _0238B6A8
ldr r0, _0238BDD8 ; =0x0238D2E0
ldr r0, _0238BDD8 ; =OVERLAY18_D_BOX_LAYOUT_8
mov r4, #5
ldr r3, _0238BDDC ; =0x0238D3C0
ldr r3, _0238BDDC ; =MOVES_SUBMENU_4
mov r1, #0x13
mov r2, #0
str r4, [sp]
@@ -1664,11 +1664,11 @@ _0238B820:
beq _0238B87C
bl sub_02040FA8
cmp r0, #0
ldrne r4, _0238BDE0 ; =0x0238D438
ldreq r4, _0238BDE4 ; =0x0238D3F0
ldrne r4, _0238BDE0 ; =MOVES_SUBMENU_6
ldreq r4, _0238BDE4 ; =MOVES_SUBMENU_5
b _0238B880
_0238B87C:
ldr r4, _0238BDE8 ; =0x0238D480
ldr r4, _0238BDE8 ; =MOVES_SUBMENU_7
_0238B880:
ldr r0, _0238BD40 ; =ov18_0238D620
mov r2, #0
@@ -1732,7 +1732,7 @@ _0238B93C:
str r3, [r5, #0x188]
str r2, [sp]
ldr r2, [r1]
ldr r0, _0238BDEC ; =0x0238D2B0
ldr r0, _0238BDEC ; =OVERLAY18_D_BOX_LAYOUT_5
ldr r1, _0238BDF0 ; =0x80000213
mov r3, r4
add r2, r2, #0x128
@@ -1751,7 +1751,7 @@ _0238B984:
cmp r1, r0
bne _0238BA70
add r0, r2, #0x300
ldr r1, _0238BDF4 ; =0x020B0A48
ldr r1, _0238BDF4 ; =TEAM_MEMBER_TABLE_PTR
ldrsh r2, [r0, #0x8c]
ldr r1, [r1]
mov r0, #0x44
@@ -1761,7 +1761,7 @@ _0238B984:
mov r2, #0xa
bl StrncpySimpleNoPadSafe
ldr r0, _0238BD40 ; =ov18_0238D620
ldr r1, _0238BDF8 ; =0x0238D5F8
ldr r1, _0238BDF8 ; =ov18_0238D5F8
ldr r0, [r0]
add r3, sp, #8
add r0, r0, #0xae
@@ -1792,7 +1792,7 @@ _0238B984:
ldr r0, _0238BD40 ; =ov18_0238D620
str r1, [sp, #4]
ldr r1, [r0]
ldr r0, _0238BE00 ; =0x0238D2C0
ldr r0, _0238BE00 ; =OVERLAY18_D_BOX_LAYOUT_6
add r2, r1, #0x1c0
ldr r1, _0238BE04 ; =0x00401833
ldr r3, _0238BE08 ; =ov18_0238AEF0
@@ -1815,8 +1815,8 @@ _0238BA70:
mov r0, #3
str r0, [sp]
ldr r1, [r1]
ldr r0, _0238BE0C ; =0x0238D2A0
ldr r3, _0238BE10 ; =0x0238D338
ldr r0, _0238BE0C ; =OVERLAY18_D_BOX_LAYOUT_4
ldr r3, _0238BE10 ; =MOVES_SUBMENU_1
add r2, r1, #0x258
mov r1, #0x33
bl CreateNormalMenu
@@ -1872,11 +1872,11 @@ _0238BB10:
add r0, r2, #0x39c
str r0, [r2, #0x350]
ldr r2, [r1]
ldr r0, _0238BE14 ; =0x0238D290
ldr r0, _0238BE14 ; =OVERLAY18_D_BOX_LAYOUT_3
str r3, [r2, #0x2f0]
str r4, [sp]
ldr r2, [r1]
ldr r3, _0238BE18 ; =0x0238D358
ldr r3, _0238BE18 ; =MOVES_SUBMENU_2
add r1, r4, #0x230
add r2, r2, #0x2f0
bl CreateNormalMenu
@@ -1893,7 +1893,7 @@ _0238BBAC:
mvn r0, #1
cmp r1, r0
bne _0238BBF0
ldr r0, _0238BE1C ; =0x0238D300
ldr r0, _0238BE1C ; =OVERLAY18_D_BOX_LAYOUT_10
bl CreateDBox
ldr r1, _0238BD40 ; =ov18_0238D620
mvn r2, #0
@@ -1991,7 +1991,7 @@ _0238BD00:
_0238BD1C:
mov r0, #3
str r0, [r4, #0x74]
bl ov00_022E6E68
bl ov11_022E6E68
bl ov18_0238AFD4
mov r0, #4
b _0238BD38
@@ -2002,9 +2002,9 @@ _0238BD38:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_0238BD40: .word ov18_0238D620
_0238BD44: .word 0x0238D4C8
_0238BD44: .word OVERLAY18_FUNCTION_POINTER_TABLE
_0238BD48: .word 0x00003008
_0238BD4C: .word 0x0238D310
_0238BD4C: .word OVERLAY18_D_BOX_LAYOUT_11
_0238BD50: .word 0x000003FB
_0238BD54: .word 0x000003F9
_0238BD58: .word 0x00003018
@@ -2029,34 +2029,34 @@ _0238BDA0: .word 0x00000401
_0238BDA4: .word 0x00000403
_0238BDA8: .word 0x00000402
_0238BDAC: .word 0x00000404
_0238BDB0: .word 0x0238D270
_0238BDB0: .word OVERLAY18_D_BOX_LAYOUT_1
_0238BDB4: .word ov18_0238AF3C
_0238BDB8: .word 0x0238D2F0
_0238BDB8: .word OVERLAY18_D_BOX_LAYOUT_9
_0238BDBC: .word 0x00300013
_0238BDC0: .word 0x0238D378
_0238BDC4: .word 0x0238D2D0
_0238BDC8: .word 0x0238D398
_0238BDCC: .word 0x0238D280
_0238BDC0: .word MOVES_MAIN_MENU
_0238BDC4: .word OVERLAY18_D_BOX_LAYOUT_7
_0238BDC8: .word MOVES_SUBMENU_3
_0238BDCC: .word OVERLAY18_D_BOX_LAYOUT_2
_0238BDD0: .word 0x00300033
_0238BDD4: .word 0x0238D320
_0238BDD8: .word 0x0238D2E0
_0238BDDC: .word 0x0238D3C0
_0238BDE0: .word 0x0238D438
_0238BDE4: .word 0x0238D3F0
_0238BDE8: .word 0x0238D480
_0238BDEC: .word 0x0238D2B0
_0238BDD4: .word MOVES_MENU_CONFIRM
_0238BDD8: .word OVERLAY18_D_BOX_LAYOUT_8
_0238BDDC: .word MOVES_SUBMENU_4
_0238BDE0: .word MOVES_SUBMENU_6
_0238BDE4: .word MOVES_SUBMENU_5
_0238BDE8: .word MOVES_SUBMENU_7
_0238BDEC: .word OVERLAY18_D_BOX_LAYOUT_5
_0238BDF0: .word 0x80000213
_0238BDF4: .word 0x020B0A48
_0238BDF8: .word 0x0238D5F8
_0238BDF4: .word TEAM_MEMBER_TABLE_PTR
_0238BDF8: .word ov18_0238D5F8
_0238BDFC: .word 0x00000A3E
_0238BE00: .word 0x0238D2C0
_0238BE00: .word OVERLAY18_D_BOX_LAYOUT_6
_0238BE04: .word 0x00401833
_0238BE08: .word ov18_0238AEF0
_0238BE0C: .word 0x0238D2A0
_0238BE10: .word 0x0238D338
_0238BE14: .word 0x0238D290
_0238BE18: .word 0x0238D358
_0238BE1C: .word 0x0238D300
_0238BE0C: .word OVERLAY18_D_BOX_LAYOUT_4
_0238BE10: .word MOVES_SUBMENU_1
_0238BE14: .word OVERLAY18_D_BOX_LAYOUT_3
_0238BE18: .word MOVES_SUBMENU_2
_0238BE1C: .word OVERLAY18_D_BOX_LAYOUT_10
_0238BE20: .word 0x000003FA
_0238BE24: .word 0x00003408
arm_func_end ov18_0238B01C
@@ -2605,7 +2605,7 @@ _0238C424: .word ov18_0238D620
ov18_0238C428: ; 0x0238C428
stmdb sp!, {r3, lr}
ldr r1, _0238C474 ; =ov18_0238D620
ldr r0, _0238C478 ; =0x020B0A48
ldr r0, _0238C478 ; =TEAM_MEMBER_TABLE_PTR
ldr r2, [r1]
ldr r1, [r0]
add r0, r2, #0x300
@@ -2624,7 +2624,7 @@ ov18_0238C428: ; 0x0238C428
ldmia sp!, {r3, pc}
.align 2, 0
_0238C474: .word ov18_0238D620
_0238C478: .word 0x020B0A48
_0238C478: .word TEAM_MEMBER_TABLE_PTR
arm_func_end ov18_0238C428
arm_func_start ov18_0238C47C
@@ -3775,50 +3775,118 @@ _0238D204: .word ov18_0238D620
arm_func_end ov18_0238D174
; 0x0238D208
.global ov18_0238D208
ov18_0238D208:
.byte 0x18, 0x00, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x20, 0x90, 0xE5, 0x49, 0x10, 0xA0, 0xE3
.byte 0x88, 0x30, 0x82, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x80, 0x10, 0x80, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1
.byte 0x20, 0xD6, 0x38, 0x02, 0x04, 0xC0, 0x9F, 0xE5, 0x11, 0x00, 0xA0, 0xE3, 0x1C, 0xFF, 0x2F, 0xE1
.byte 0x28, 0xBE, 0x38, 0x02, 0x18, 0x00, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x20, 0x90, 0xE5
.byte 0x20, 0xD6, 0x38, 0x02
.global ov18_0238D22C
ov18_0238D22C:
.byte 0x04, 0xC0, 0x9F, 0xE5, 0x11, 0x00, 0xA0, 0xE3, 0x1C, 0xFF, 0x2F, 0xE1
.byte 0x28, 0xBE, 0x38, 0x02
.global ov18_0238D23C
ov18_0238D23C:
.byte 0x18, 0x00, 0x9F, 0xE5, 0x03, 0x30, 0xA0, 0xE3, 0x00, 0x20, 0x90, 0xE5
.byte 0x4B, 0x10, 0xA0, 0xE3, 0x88, 0x30, 0x82, 0xE5, 0x00, 0x00, 0x90, 0xE5, 0x80, 0x10, 0x80, 0xE5
.byte 0x1E, 0xFF, 0x2F, 0xE1, 0x20, 0xD6, 0x38, 0x02, 0x04, 0xC0, 0x9F, 0xE5, 0x11, 0x00, 0xA0, 0xE3
.byte 0x1C, 0xFF, 0x2F, 0xE1, 0x28, 0xBE, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x04
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x0B, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x12, 0x1C, 0x04
.byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05
.byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0xFF, 0x2F, 0xE1, 0x20, 0xD6, 0x38, 0x02
.global ov18_0238D260
ov18_0238D260:
.byte 0x04, 0xC0, 0x9F, 0xE5, 0x11, 0x00, 0xA0, 0xE3
.byte 0x1C, 0xFF, 0x2F, 0xE1, 0x28, 0xBE, 0x38, 0x02
.global OVERLAY18_D_BOX_LAYOUT_1
OVERLAY18_D_BOX_LAYOUT_1:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x04
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_2
OVERLAY18_D_BOX_LAYOUT_2:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_3
OVERLAY18_D_BOX_LAYOUT_3:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_4
OVERLAY18_D_BOX_LAYOUT_4:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_5
OVERLAY18_D_BOX_LAYOUT_5:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_6
OVERLAY18_D_BOX_LAYOUT_6:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_7
OVERLAY18_D_BOX_LAYOUT_7:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x0B, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_8
OVERLAY18_D_BOX_LAYOUT_8:
.byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x02, 0x0B, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_9
OVERLAY18_D_BOX_LAYOUT_9:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_10
OVERLAY18_D_BOX_LAYOUT_10:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x12, 0x1C, 0x04
.byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY18_D_BOX_LAYOUT_11
OVERLAY18_D_BOX_LAYOUT_11:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x11, 0x1C, 0x05
.byte 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MOVES_MENU_CONFIRM
MOVES_MENU_CONFIRM:
.byte 0xE7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xE8, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_1
MOVES_SUBMENU_1:
.byte 0xF3, 0x03, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0xEB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_2
MOVES_SUBMENU_2:
.byte 0xF0, 0x03, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xEB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.global MOVES_MAIN_MENU
MOVES_MAIN_MENU:
.byte 0xEA, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xEB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_3
MOVES_SUBMENU_3:
.byte 0xED, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xEE, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0xF3, 0x03, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0xE9, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xF4, 0x03, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_4
MOVES_SUBMENU_4:
.byte 0xF4, 0x03, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00
.byte 0xF5, 0x03, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0xF6, 0x03, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
.byte 0xF3, 0x03, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xED, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_5
MOVES_SUBMENU_5:
.byte 0xED, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
.byte 0xEE, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xEF, 0x03, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00
.byte 0x3F, 0x0A, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x40, 0x0A, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00
.byte 0xF0, 0x03, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xEB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_6
MOVES_SUBMENU_6:
.byte 0xF1, 0x03, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0xEE, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0xEF, 0x03, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x3F, 0x0A, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00
.byte 0x40, 0x0A, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0xF0, 0x03, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00
.byte 0xEB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xF2, 0x03, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.global MOVES_SUBMENU_7
MOVES_SUBMENU_7:
.byte 0xF2, 0x03, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00
.byte 0xEE, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xEF, 0x03, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00
.byte 0x3F, 0x0A, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x40, 0x0A, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00
.byte 0xF0, 0x03, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xEB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0xEC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.global OVERLAY18_FUNCTION_POINTER_TABLE
OVERLAY18_FUNCTION_POINTER_TABLE:
.byte 0x48, 0xBE, 0x38, 0x02, 0x6C, 0xBE, 0x38, 0x02, 0x90, 0xBE, 0x38, 0x02, 0x0C, 0xBF, 0x38, 0x02
.byte 0x30, 0xBF, 0x38, 0x02, 0x60, 0xBF, 0x38, 0x02, 0x84, 0xBF, 0x38, 0x02, 0xA8, 0xBF, 0x38, 0x02
.byte 0x3C, 0xC0, 0x38, 0x02, 0x60, 0xC0, 0x38, 0x02, 0x78, 0xC0, 0x38, 0x02, 0x60, 0xC0, 0x38, 0x02
@@ -3837,11 +3905,18 @@ _0238D204: .word ov18_0238D620
.byte 0xFC, 0xCD, 0x38, 0x02, 0x20, 0xCE, 0x38, 0x02, 0x88, 0xCE, 0x38, 0x02, 0xD8, 0xCE, 0x38, 0x02
.byte 0x98, 0xCF, 0x38, 0x02, 0x34, 0xD0, 0x38, 0x02, 0x50, 0xD0, 0x38, 0x02, 0x74, 0xD0, 0x38, 0x02
.byte 0x98, 0xD0, 0x38, 0x02, 0x2C, 0xD1, 0x38, 0x02, 0x50, 0xD1, 0x38, 0x02, 0x74, 0xD1, 0x38, 0x02
.byte 0x08, 0xD2, 0x38, 0x02, 0x2C, 0xD2, 0x38, 0x02, 0x3C, 0xD2, 0x38, 0x02, 0x60, 0xD2, 0x38, 0x02
.word ov18_0238D208
.word ov18_0238D22C
.word ov18_0238D23C
.word ov18_0238D260
.global ov18_0238D5F8
ov18_0238D5F8:
.byte 0x5B, 0x43, 0x53, 0x3A, 0x25, 0x63, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00
.global ov18_0238D608
ov18_0238D608:
.byte 0x5B, 0x43, 0x53, 0x3A, 0x56, 0x5D, 0x5B, 0x67, 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x5B, 0x43
.byte 0x52, 0x5D, 0x00, 0x00
.data
.global ov18_0238D620
ov18_0238D620:

430
asm/overlay_19.s
View File

File diff suppressed because it is too large Load Diff

506
asm/overlay_20.s
View File

File diff suppressed because it is too large Load Diff

343
asm/overlay_21.s
View File

@@ -84,7 +84,7 @@ _0238A168: ; jump table
b _0238B7B8 ; case 65
b _0238B7B8 ; case 66
_0238A274:
ldr r0, _0238B090 ; =0x0238CBB8
ldr r0, _0238B090 ; =ov21_0238CBB8
bl DebugPrint0
mov r0, r4
ldr r1, [r0]
@@ -131,9 +131,9 @@ _0238A274:
bl ShowPortraitBox
b _0238B7B8
_0238A32C:
ldr r0, _0238B0A0 ; =0x0238CBD4
ldr r0, _0238B0A0 ; =ov21_0238CBD4
bl DebugPrint0
ldr r0, _0238B0A4 ; =0x0238CA28
ldr r0, _0238B0A4 ; =SWAP_SHOP_D_BOX_LAYOUT_1
ldr r1, _0238B0A8 ; =ov21_0238C9A4
bl sub_0202F8C4
mov r2, r4
@@ -141,8 +141,8 @@ _0238A32C:
ldr r1, _0238B0AC ; =0x00300013
strb r0, [r2, #0x84]
mov r4, #4
ldr r3, _0238B0B0 ; =0x0238CAA8
ldr r0, _0238B0B4 ; =0x0238CB68
ldr r3, _0238B0B0 ; =SWAP_SHOP_MAIN_MENU_2
ldr r0, _0238B0B4 ; =SWAP_SHOP_D_BOX_LAYOUT_5
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -151,7 +151,7 @@ _0238A32C:
strb r0, [r1, #0x83]
b _0238B7B8
_0238A378:
ldr r0, _0238B0B8 ; =0x0238CBF8
ldr r0, _0238B0B8 ; =ov21_0238CBF8
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -206,10 +206,10 @@ _0238A3E0:
bl ShowMessageInDBox
b _0238B7B8
_0238A44C:
ldr r0, _0238B0C0 ; =0x0238CB88
ldr r0, _0238B0C0 ; =SWAP_SHOP_D_BOX_LAYOUT_7
mov r4, #3
ldr r1, _0238B0AC ; =0x00300013
ldr r3, _0238B0C4 ; =0x0238CA68
ldr r3, _0238B0C4 ; =SWAP_SHOP_SUBMENU_2
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -222,7 +222,7 @@ ov21_0238A468: ; 0x0238A468
strb r0, [r1, #0x83]
b _0238B7B8
_0238A478:
ldr r0, _0238B0C8 ; =0x0238CC18
ldr r0, _0238B0C8 ; =ov21_0238CC18
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -252,7 +252,7 @@ _0238A478:
bl ShowMessageInDBox
b _0238B7B8
_0238A4EC:
ldr r0, _0238B0C8 ; =0x0238CC18
ldr r0, _0238B0C8 ; =ov21_0238CC18
bl DebugPrint0
mov r0, r4
ldr r2, [r0]
@@ -266,7 +266,7 @@ _0238A4EC:
bl ShowMessageInDBox
b _0238B7B8
_0238A520:
ldr r0, _0238B0C8 ; =0x0238CC18
ldr r0, _0238B0C8 ; =ov21_0238CC18
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -296,7 +296,7 @@ _0238A520:
bl ShowMessageInDBox
b _0238B7B8
_0238A594:
ldr r0, _0238B0D8 ; =0x0238CC3C
ldr r0, _0238B0D8 ; =ov21_0238CC3C
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -351,7 +351,7 @@ _0238A5FC:
bl ShowMessageInDBox
b _0238B7B8
_0238A668:
ldr r0, _0238B0E0 ; =0x0238CC5C
ldr r0, _0238B0E0 ; =ov21_0238CC5C
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -381,7 +381,7 @@ _0238A668:
bl ShowMessageInDBox
b _0238B7B8
_0238A6DC:
ldr r0, _0238B0E8 ; =0x0238CC7C
ldr r0, _0238B0E8 ; =ov21_0238CC7C
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -411,7 +411,7 @@ _0238A6DC:
bl ShowMessageInDBox
b _0238B7B8
_0238A750:
ldr r0, _0238B0EC ; =0x0238CC9C
ldr r0, _0238B0EC ; =ov21_0238CC9C
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -444,7 +444,7 @@ _0238A750:
bl ShowMessageInDBox
b _0238B7B8
_0238A7D0:
ldr r0, _0238B0F4 ; =0x0238CCC0
ldr r0, _0238B0F4 ; =ov21_0238CCC0
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -474,12 +474,12 @@ _0238A7D0:
bl ShowMessageInDBox
b _0238B7B8
_0238A844:
ldr r0, _0238B0F8 ; =0x0238CCE4
ldr r0, _0238B0F8 ; =ov21_0238CCE4
bl DebugPrint0
bl ov11_022DC504
b _0238B7B8
_0238A854:
ldr r0, _0238B0FC ; =0x0238CD00
ldr r0, _0238B0FC ; =ov21_0238CD00
bl DebugPrint0
bl ov21_0238C920
mov r0, r4
@@ -512,7 +512,7 @@ _0238A854:
bl ShowMessageInDBox
b _0238B7B8
_0238A8D4:
ldr r0, _0238B100 ; =0x0238CD24
ldr r0, _0238B100 ; =ov21_0238CD24
bl DebugPrint0
mov r0, r4
ldr r1, [r0]
@@ -544,7 +544,7 @@ _0238A8D4:
bl ShowMessageInDBox
b _0238B7B8
_0238A950:
ldr r0, _0238B108 ; =0x0238CD44
ldr r0, _0238B108 ; =ov21_0238CD44
bl DebugPrint0
mov r0, r4
ldr r0, [r0]
@@ -560,7 +560,7 @@ _0238A950:
bl HidePortraitBox
b _0238B7B8
_0238A98C:
ldr r0, _0238B10C ; =0x0238CD68
ldr r0, _0238B10C ; =ov21_0238CD68
bl DebugPrint0
bl ov11_0230C910
mov r0, #0
@@ -568,7 +568,7 @@ _0238A98C:
bl ov11_0230B20C
b _0238B7B8
_0238A9A8:
ldr r0, _0238B110 ; =0x0238CD8C
ldr r0, _0238B110 ; =ov21_0238CD8C
bl DebugPrint0
mov r0, r4
ldr r0, [r0]
@@ -585,12 +585,12 @@ _0238A9A8:
bl ov11_0230BB98
b _0238B7B8
_0238A9E8:
ldr r0, _0238B114 ; =0x0238CDB4
ldr r0, _0238B114 ; =ov21_0238CDB4
bl DebugPrint0
mov r4, #3
ldr r0, _0238B118 ; =0x0238CB78
ldr r0, _0238B118 ; =SWAP_SHOP_D_BOX_LAYOUT_6
ldr r1, _0238B11C ; =0x00400013
ldr r3, _0238B120 ; =0x0238CA88
ldr r3, _0238B120 ; =SWAP_SHOP_MAIN_MENU_1
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -599,11 +599,11 @@ _0238A9E8:
strb r0, [r1, #0x83]
b _0238B7B8
_0238AA1C:
ldr r0, _0238B124 ; =0x0238CDDC
ldr r0, _0238B124 ; =ov21_0238CDDC
bl DebugPrint0
mov r0, r4
ldr r5, [r0]
ldr r2, _0238B128 ; =0x0238CE00
ldr r2, _0238B128 ; =ov21_0238CE00
ldrsh r4, [r5, #0xe]
ldr r3, _0238B12C ; =0x0000C402
mov r1, #0x400
@@ -621,7 +621,7 @@ _0238AA1C:
ldr r0, _0238B08C ; =ov21_0238CF40
add r1, sp, #0x18
ldr r3, [r0]
ldr r0, _0238B130 ; =0x0238CB98
ldr r0, _0238B130 ; =SWAP_SHOP_D_BOX_LAYOUT_8
add r2, r3, #0x86
str r2, [sp, #0x50]
str r1, [sp]
@@ -641,7 +641,7 @@ _0238AA1C:
strb r0, [r1, #0x85]
b _0238B7B8
_0238AAC0:
ldr r0, _0238B13C ; =0x0238CE0C
ldr r0, _0238B13C ; =ov21_0238CE0C
bl DebugPrint0
mov r0, r4
ldr r1, [r0]
@@ -715,12 +715,12 @@ _0238ABC0:
bl ShowMessageInDBox
b _0238B7B8
_0238ABDC:
ldr r0, _0238B148 ; =0x0238CE34
ldr r0, _0238B148 ; =ov21_0238CE34
bl DebugPrint0
mov r1, r4
ldr r2, [r1]
mov r3, #0x96
ldr r0, _0238B0A4 ; =0x0238CA28
ldr r0, _0238B0A4 ; =SWAP_SHOP_D_BOX_LAYOUT_1
ldr r1, _0238B0A8 ; =ov21_0238C9A4
str r3, [r2, #0x54]
bl sub_0202F8C4
@@ -729,8 +729,8 @@ _0238ABDC:
ldr r1, _0238B0AC ; =0x00300013
strb r0, [r2, #0x84]
mov r4, #2
ldr r3, _0238B14C ; =0x0238CA38
ldr r0, _0238B0C0 ; =0x0238CB88
ldr r3, _0238B14C ; =SWAP_SHOP_MENU_CONFIRM
ldr r0, _0238B0C0 ; =SWAP_SHOP_D_BOX_LAYOUT_7
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -739,7 +739,7 @@ _0238ABDC:
strb r0, [r1, #0x83]
b _0238B7B8
_0238AC38:
ldr r0, _0238B150 ; =0x0238CE4C
ldr r0, _0238B150 ; =ov21_0238CE4C
bl DebugPrint0
mov r0, r4
ldr r1, [r0]
@@ -757,7 +757,7 @@ _0238AC38:
bl HidePortraitBox
b _0238B7B8
_0238AC7C:
ldr r0, _0238B154 ; =0x0238CE78
ldr r0, _0238B154 ; =ov21_0238CE78
bl DebugPrint0
mov r0, r4
ldr r1, [r0]
@@ -775,7 +775,7 @@ _0238AC7C:
bl HidePortraitBox
b _0238B7B8
_0238ACC0:
ldr r0, _0238B158 ; =0x0238CEA4
ldr r0, _0238B158 ; =ov21_0238CEA4
bl DebugPrint0
mov r0, r4
ldr r1, [r0]
@@ -929,7 +929,7 @@ _0238AE94:
bl ShowPortraitBox
b _0238B7B8
_0238AEF4:
ldr r0, _0238B164 ; =0x0238CED0
ldr r0, _0238B164 ; =ov21_0238CED0
bl DebugPrint0
mov r0, r4
mov r2, #0x13
@@ -953,7 +953,7 @@ _0238AEF4:
bl HidePortraitBox
b _0238B7B8
_0238AF50:
ldr r0, _0238B16C ; =0x0238CEF8
ldr r0, _0238B16C ; =ov21_0238CEF8
bl DebugPrint0
mvn r0, #0x95
bl AddMoneyCarried
@@ -1043,62 +1043,62 @@ _0238B064:
b _0238B188
.align 2, 0
_0238B08C: .word ov21_0238CF40
_0238B090: .word 0x0238CBB8
_0238B090: .word ov21_0238CBB8
_0238B094: .word 0x00003008
_0238B098: .word 0x000003B2
_0238B09C: .word 0x000001EF
_0238B0A0: .word 0x0238CBD4
_0238B0A4: .word 0x0238CA28
_0238B0A0: .word ov21_0238CBD4
_0238B0A4: .word SWAP_SHOP_D_BOX_LAYOUT_1
_0238B0A8: .word ov21_0238C9A4
_0238B0AC: .word 0x00300013
_0238B0B0: .word 0x0238CAA8
_0238B0B4: .word 0x0238CB68
_0238B0B8: .word 0x0238CBF8
_0238B0B0: .word SWAP_SHOP_MAIN_MENU_2
_0238B0B4: .word SWAP_SHOP_D_BOX_LAYOUT_5
_0238B0B8: .word ov21_0238CBF8
_0238B0BC: .word 0x000003B3
_0238B0C0: .word 0x0238CB88
_0238B0C4: .word 0x0238CA68
_0238B0C8: .word 0x0238CC18
_0238B0C0: .word SWAP_SHOP_D_BOX_LAYOUT_7
_0238B0C4: .word SWAP_SHOP_SUBMENU_2
_0238B0C8: .word ov21_0238CC18
_0238B0CC: .word 0x00003018
_0238B0D0: .word 0x000003C5
_0238B0D4: .word 0x000003C7
_0238B0D8: .word 0x0238CC3C
_0238B0D8: .word ov21_0238CC3C
_0238B0DC: .word 0x000003B7
_0238B0E0: .word 0x0238CC5C
_0238B0E0: .word ov21_0238CC5C
_0238B0E4: .word 0x000003B6
_0238B0E8: .word 0x0238CC7C
_0238B0EC: .word 0x0238CC9C
_0238B0E8: .word ov21_0238CC7C
_0238B0EC: .word ov21_0238CC9C
_0238B0F0: .word 0x000003B5
_0238B0F4: .word 0x0238CCC0
_0238B0F8: .word 0x0238CCE4
_0238B0FC: .word 0x0238CD00
_0238B100: .word 0x0238CD24
_0238B0F4: .word ov21_0238CCC0
_0238B0F8: .word ov21_0238CCE4
_0238B0FC: .word ov21_0238CD00
_0238B100: .word ov21_0238CD24
_0238B104: .word 0x000003C2
_0238B108: .word 0x0238CD44
_0238B10C: .word 0x0238CD68
_0238B110: .word 0x0238CD8C
_0238B114: .word 0x0238CDB4
_0238B118: .word 0x0238CB78
_0238B108: .word ov21_0238CD44
_0238B10C: .word ov21_0238CD68
_0238B110: .word ov21_0238CD8C
_0238B114: .word ov21_0238CDB4
_0238B118: .word SWAP_SHOP_D_BOX_LAYOUT_6
_0238B11C: .word 0x00400013
_0238B120: .word 0x0238CA88
_0238B124: .word 0x0238CDDC
_0238B128: .word 0x0238CE00
_0238B120: .word SWAP_SHOP_MAIN_MENU_1
_0238B124: .word ov21_0238CDDC
_0238B128: .word ov21_0238CE00
_0238B12C: .word 0x0000C402
_0238B130: .word 0x0238CB98
_0238B130: .word SWAP_SHOP_D_BOX_LAYOUT_8
_0238B134: .word 0x00001013
_0238B138: .word 0x0000033E
_0238B13C: .word 0x0238CE0C
_0238B13C: .word ov21_0238CE0C
_0238B140: .word 0x000003BD
_0238B144: .word 0x000003BB
_0238B148: .word 0x0238CE34
_0238B14C: .word 0x0238CA38
_0238B150: .word 0x0238CE4C
_0238B154: .word 0x0238CE78
_0238B158: .word 0x0238CEA4
_0238B148: .word ov21_0238CE34
_0238B14C: .word SWAP_SHOP_MENU_CONFIRM
_0238B150: .word ov21_0238CE4C
_0238B154: .word ov21_0238CE78
_0238B158: .word ov21_0238CEA4
_0238B15C: .word 0x000003C1
_0238B160: .word 0x000003BA
_0238B164: .word 0x0238CED0
_0238B164: .word ov21_0238CED0
_0238B168: .word 0x00001311
_0238B16C: .word 0x0238CEF8
_0238B16C: .word ov21_0238CEF8
_0238B170:
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r0, [r0]
@@ -1164,9 +1164,9 @@ _0238B228:
bl sub_02039C2C
b _0238B7B8
_0238B260:
ldr r0, _0238B7C8 ; =0x0238CBA8
ldr r0, _0238B7C8 ; =SWAP_SHOP_D_BOX_LAYOUT_9
mov r4, #5
ldr r3, _0238B7CC ; =0x0238CAD0
ldr r3, _0238B7CC ; =SWAP_SHOP_SUBMENU_3
mov r1, #0x13
mov r2, #0
str r4, [sp]
@@ -1277,9 +1277,9 @@ _0238B3B8:
bl ov11_0230B20C
b _0238B7B8
_0238B408:
ldr r0, _0238B118 ; =0x0238CB78
ldr r0, _0238B118 ; =SWAP_SHOP_D_BOX_LAYOUT_6
mov r4, #2
ldr r3, _0238B7D4 ; =0x0238CA50
ldr r3, _0238B7D4 ; =SWAP_SHOP_SUBMENU_1
mov r1, #0x13
mov r2, #0
str r4, [sp]
@@ -1290,7 +1290,7 @@ _0238B408:
b _0238B7B8
_0238B434:
ldrsh r1, [r0, #0xe]
ldr r2, _0238B128 ; =0x0238CE00
ldr r2, _0238B128 ; =ov21_0238CE00
ldr r3, _0238B12C ; =0x0000C402
str r1, [r0, #0x40]
ldr r5, [r4]
@@ -1307,7 +1307,7 @@ _0238B434:
ldr r0, _0238B08C ; =ov21_0238CF40
add r1, sp, #0xe0
ldr r4, [r0]
ldr r0, _0238B130 ; =0x0238CB98
ldr r0, _0238B130 ; =SWAP_SHOP_D_BOX_LAYOUT_8
add r2, r4, #0x86
str r2, [sp, #0x118]
str r1, [sp]
@@ -1384,10 +1384,10 @@ _0238B538:
bl ShowMessageInDBox
b _0238B7B8
_0238B5A4:
ldr r0, _0238B0C0 ; =0x0238CB88
ldr r0, _0238B0C0 ; =SWAP_SHOP_D_BOX_LAYOUT_7
mov r4, #2
ldr r1, _0238B0AC ; =0x00300013
ldr r3, _0238B14C ; =0x0238CA38
ldr r3, _0238B14C ; =SWAP_SHOP_MENU_CONFIRM
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1474,9 +1474,9 @@ _0238B68C:
bl ShowMessageInDBox
b _0238B7B8
_0238B6F8:
ldr r0, _0238B118 ; =0x0238CB78
ldr r0, _0238B118 ; =SWAP_SHOP_D_BOX_LAYOUT_6
mov r4, #2
ldr r3, _0238B7D4 ; =0x0238CA50
ldr r3, _0238B7D4 ; =SWAP_SHOP_SUBMENU_1
mov r1, #0x13
mov r2, #0
str r4, [sp]
@@ -1487,7 +1487,7 @@ _0238B6F8:
b _0238B7B8
_0238B724:
ldrsh r1, [r0, #0x18]
ldr r2, _0238B128 ; =0x0238CE00
ldr r2, _0238B128 ; =ov21_0238CE00
ldr r3, _0238B12C ; =0x0000C402
str r1, [r0, #0x40]
ldr r5, [r4]
@@ -1504,7 +1504,7 @@ _0238B724:
ldr r0, _0238B08C ; =ov21_0238CF40
add r1, sp, #0x130
ldr r4, [r0]
ldr r0, _0238B130 ; =0x0238CB98
ldr r0, _0238B130 ; =SWAP_SHOP_D_BOX_LAYOUT_8
add r2, r4, #0x86
str r2, [sp, #0x168]
str r1, [sp]
@@ -1529,10 +1529,10 @@ _0238B7B8:
.align 2, 0
_0238B7C0: .word 0x000003BE
_0238B7C4: .word 0x000003CA
_0238B7C8: .word 0x0238CBA8
_0238B7CC: .word 0x0238CAD0
_0238B7C8: .word SWAP_SHOP_D_BOX_LAYOUT_9
_0238B7CC: .word SWAP_SHOP_SUBMENU_3
_0238B7D0: .word 0x000003CB
_0238B7D4: .word 0x0238CA50
_0238B7D4: .word SWAP_SHOP_SUBMENU_1
_0238B7D8: .word 0x000003B9
_0238B7DC: .word 0x000003C9
arm_func_end ov21_0238ADFC
@@ -1659,7 +1659,7 @@ _0238B948: ; jump table
_0238B96C:
mov r0, #4
str r0, [r3, #0x2c]
bl ov00_022E6E68
bl ov11_022E6E68
b _0238C914
_0238B97C:
ldr r2, [r3]
@@ -1748,7 +1748,7 @@ _0238BA9C:
bl ShowDBox
b _0238C7E4
_0238BAC8:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238C7E4
bl ov11_02310C2C
@@ -2016,7 +2016,7 @@ _0238BE84: ; jump table
b _0238BEA8 ; case 7
b _0238BED8 ; case 8
_0238BEA8:
ldr r0, _0238C8E4 ; =0x0238CF1C
ldr r0, _0238C8E4 ; =OVERLAY21_JP_STRING
bl DebugPrint0
bl ov21_0238C920
bl ov11_0230B694
@@ -2052,7 +2052,7 @@ _0238BF08:
beq _0238BF50
b _0238C7E4
_0238BF20:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =ov21_0238CF40
@@ -2060,12 +2060,12 @@ _0238BF20:
ldr r0, [r1, #8]
add r0, r0, #1
str r0, [r1, #8]
bl ov00_0230D92C
bl ov11_0230D92C
bl ov21_0238C920
bl ov11_0230B9BC
b _0238C7E4
_0238BF50:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =ov21_0238CF40
@@ -2618,7 +2618,7 @@ _0238C708:
str r1, [r0, #8]
b _0238C7E4
_0238C724:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =ov21_0238CF40
@@ -2635,7 +2635,7 @@ _0238C724:
mvn r0, #0
mov r1, #0
bl InitRandomNpcJobs
bl ov00_0230D92C
bl ov11_0230D92C
ldr r0, _0238C8D0 ; =ov21_0238CF40
mov r2, #0
ldr r1, [r0]
@@ -2644,7 +2644,7 @@ _0238C724:
str r2, [r0, #8]
b _0238C7E4
_0238C788:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238C7E4
ldr r0, _0238C8D0 ; =ov21_0238CF40
@@ -2740,7 +2740,7 @@ _0238C8D4: .word 0x00003F02
_0238C8D8: .word 0x00001308
_0238C8DC: .word 0x00003018
_0238C8E0: .word 0x000003B9
_0238C8E4: .word 0x0238CF1C
_0238C8E4: .word OVERLAY21_JP_STRING
_0238C8E8:
bl ov11_022E6EC8
cmp r0, #0
@@ -2811,7 +2811,7 @@ ov21_0238C9A4: ; 0x0238C9A4
add ip, sp, #0x400
str r0, [sp, #0x428]
add ip, ip, #4
ldr r2, _0238CA1C ; =0x0238CF24
ldr r2, _0238CA1C ; =ov21_0238CF24
ldr r3, _0238CA20 ; =0x0000C402
add r0, sp, #4
mov r1, #0x100
@@ -2833,23 +2833,39 @@ ov21_0238C9A4: ; 0x0238C9A4
add sp, sp, #0x400
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238CA1C: .word 0x0238CF24
_0238CA1C: .word ov21_0238CF24
_0238CA20: .word 0x0000C402
_0238CA24: .word 0x00000225
arm_func_end ov21_0238C9A4
; 0x0238CA28
.global SWAP_SHOP_D_BOX_LAYOUT_1
SWAP_SHOP_D_BOX_LAYOUT_1:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SWAP_SHOP_MENU_CONFIRM
SWAP_SHOP_MENU_CONFIRM:
.byte 0xAB, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xAC, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB0, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global SWAP_SHOP_SUBMENU_1
SWAP_SHOP_SUBMENU_1:
.byte 0xB0, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0xAD, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global SWAP_SHOP_SUBMENU_2
SWAP_SHOP_SUBMENU_2:
.byte 0xCD, 0x03, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0xCE, 0x03, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00
.byte 0xCF, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global SWAP_SHOP_MAIN_MENU_1
SWAP_SHOP_MAIN_MENU_1:
.byte 0xAE, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xB0, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0xB1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global SWAP_SHOP_MAIN_MENU_2
SWAP_SHOP_MAIN_MENU_2:
.byte 0xAE, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xAF, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0xB0, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xAD, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xAF, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global SWAP_SHOP_SUBMENU_3
SWAP_SHOP_SUBMENU_3:
.byte 0xAF, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
.byte 0xED, 0x02, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xEE, 0x02, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00
.byte 0xEF, 0x02, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0xB1, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB2, 0x03, 0xB3, 0x03, 0xC5, 0x03, 0xC8, 0x03
@@ -2859,66 +2875,151 @@ _0238CA24: .word 0x00000225
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x10, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x0A, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x0F, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SWAP_SHOP_D_BOX_LAYOUT_5
SWAP_SHOP_D_BOX_LAYOUT_5:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SWAP_SHOP_D_BOX_LAYOUT_6
SWAP_SHOP_D_BOX_LAYOUT_6:
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SWAP_SHOP_D_BOX_LAYOUT_7
SWAP_SHOP_D_BOX_LAYOUT_7:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SWAP_SHOP_D_BOX_LAYOUT_8
SWAP_SHOP_D_BOX_LAYOUT_8:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SWAP_SHOP_D_BOX_LAYOUT_9
SWAP_SHOP_D_BOX_LAYOUT_9:
.byte 0x00, 0x00, 0x00, 0x00, 0x14, 0x02, 0x0A, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov21_0238CBB8
ov21_0238CBB8:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D
.byte 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00, 0x4D, 0x45, 0x4E, 0x55
.byte 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00
.global ov21_0238CBD4
ov21_0238CBD4:
.byte 0x4D, 0x45, 0x4E, 0x55
.byte 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F
.byte 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x4D, 0x45, 0x4E, 0x55, 0x3A, 0x0A, 0x00, 0x00, 0x00, 0x00
.global ov21_0238CBF8
ov21_0238CBF8:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D
.byte 0x4F, 0x44, 0x45, 0x5F, 0x52, 0x45, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CC18
ov21_0238CC18:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D
.byte 0x4F, 0x44, 0x45, 0x5F, 0x45, 0x58, 0x50, 0x4C, 0x41, 0x4E, 0x41, 0x54, 0x49, 0x4F, 0x4E, 0x3A
.byte 0x0A, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CC3C
ov21_0238CC3C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B, 0x53, 0x3A, 0x0A
.byte 0x00, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x00, 0x00, 0x00, 0x00
.global ov21_0238CC5C
ov21_0238CC5C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x49, 0x54, 0x45, 0x4D, 0x5F, 0x4E, 0x4F, 0x4E
.byte 0x3A, 0x0A, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x3A, 0x0A, 0x00, 0x00
.global ov21_0238CC7C
ov21_0238CC7C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x47, 0x4F, 0x4C, 0x44, 0x5F, 0x4E, 0x4F, 0x4E
.byte 0x0A, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CC9C
ov21_0238CC9C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x47, 0x4F, 0x4C, 0x44, 0x81, 0x51, 0x4E, 0x4F, 0x5F, 0x43, 0x48, 0x41, 0x52
.byte 0x47, 0x45, 0x3A, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E
.byte 0x47, 0x45, 0x3A, 0x0A, 0x00, 0x00, 0x00, 0x00
.global ov21_0238CCC0
ov21_0238CCC0:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E
.byte 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45
.byte 0x43, 0x54, 0x5F, 0x46, 0x55, 0x4C, 0x4C, 0x3A, 0x0A, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55
.byte 0x43, 0x54, 0x5F, 0x46, 0x55, 0x4C, 0x4C, 0x3A, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CCE4
ov21_0238CCE4:
.byte 0x4D, 0x45, 0x4E, 0x55
.byte 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F
.byte 0x51, 0x55, 0x49, 0x54, 0x0A, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E
.byte 0x51, 0x55, 0x49, 0x54, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CD00
ov21_0238CD00:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E
.byte 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45
.byte 0x43, 0x54, 0x5F, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55
.byte 0x43, 0x54, 0x5F, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00, 0x00
.global ov21_0238CD24
ov21_0238CD24:
.byte 0x4D, 0x45, 0x4E, 0x55
.byte 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F
.byte 0x5F, 0x52, 0x45, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55
.byte 0x5F, 0x52, 0x45, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3A, 0x0A, 0x00, 0x00
.global ov21_0238CD44
ov21_0238CD44:
.byte 0x4D, 0x45, 0x4E, 0x55
.byte 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F
.byte 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x49, 0x4E, 0x49, 0x54, 0x3A, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CD68
ov21_0238CD68:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D
.byte 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43
.byte 0x54, 0x3A, 0x0A, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x54, 0x3A, 0x0A, 0x00
.global ov21_0238CD8C
ov21_0238CD8C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x52
.byte 0x45, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x3A, 0x0A, 0x00, 0x00, 0x00, 0x09, 0x4D, 0x45, 0x4E
.byte 0x45, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x3A, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CDB4
ov21_0238CDB4:
.byte 0x09, 0x4D, 0x45, 0x4E
.byte 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45
.byte 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x53, 0x55, 0x42, 0x5F, 0x4D, 0x45, 0x4E, 0x55
.byte 0x3A, 0x0A, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x3A, 0x0A, 0x00, 0x00
.global ov21_0238CDDC
ov21_0238CDDC:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x45
.byte 0x58, 0x50, 0x4C, 0x41, 0x0A, 0x00, 0x00, 0x00, 0x5B, 0x69, 0x74, 0x65, 0x6D, 0x3A, 0x30, 0x5D
.byte 0x00, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x58, 0x50, 0x4C, 0x41, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CE00
ov21_0238CE00:
.byte 0x5B, 0x69, 0x74, 0x65, 0x6D, 0x3A, 0x30, 0x5D
.byte 0x00, 0x00, 0x00, 0x00
.global ov21_0238CE0C
ov21_0238CE0C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x43
.byte 0x4F, 0x4E, 0x46, 0x49, 0x52, 0x4D, 0x5F, 0x31, 0x3A, 0x0A, 0x00, 0x00, 0x5F, 0x53, 0x45, 0x4C
.byte 0x4F, 0x4E, 0x46, 0x49, 0x52, 0x4D, 0x5F, 0x31, 0x3A, 0x0A, 0x00, 0x00
.global ov21_0238CE34
ov21_0238CE34:
.byte 0x5F, 0x53, 0x45, 0x4C
.byte 0x4C, 0x5F, 0x43, 0x4F, 0x4E, 0x46, 0x49, 0x52, 0x4D, 0x20, 0x4E, 0x45, 0x57, 0x5F, 0x31, 0x0A
.byte 0x00, 0x00, 0x00, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x00, 0x00, 0x00, 0x00
.global ov21_0238CE4C
ov21_0238CE4C:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53
.byte 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x54
.byte 0x48, 0x41, 0x4E, 0x4B, 0x53, 0x5F, 0x41, 0x43, 0x54, 0x49, 0x4F, 0x4E, 0x3A, 0x0A, 0x00, 0x00
.global ov21_0238CE78
ov21_0238CE78:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D
.byte 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B
.byte 0x53, 0x5F, 0x41, 0x43, 0x54, 0x49, 0x4F, 0x4E, 0x32, 0x3A, 0x0A, 0x00, 0x4D, 0x45, 0x4E, 0x55
.byte 0x53, 0x5F, 0x41, 0x43, 0x54, 0x49, 0x4F, 0x4E, 0x32, 0x3A, 0x0A, 0x00
.global ov21_0238CEA4
ov21_0238CEA4:
.byte 0x4D, 0x45, 0x4E, 0x55
.byte 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F
.byte 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B, 0x53, 0x5F, 0x41, 0x43
.byte 0x54, 0x49, 0x4F, 0x4E, 0x33, 0x3A, 0x0A, 0x00, 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E
.byte 0x54, 0x49, 0x4F, 0x4E, 0x33, 0x3A, 0x0A, 0x00
.global ov21_0238CED0
ov21_0238CED0:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E
.byte 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D, 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45
.byte 0x43, 0x54, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B, 0x53, 0x5F, 0x31, 0x3A, 0x0A, 0x00, 0x00, 0x00
.global ov21_0238CEF8
ov21_0238CEF8:
.byte 0x4D, 0x45, 0x4E, 0x55, 0x5F, 0x53, 0x59, 0x4E, 0x54, 0x48, 0x45, 0x53, 0x49, 0x53, 0x5F, 0x4D
.byte 0x4F, 0x44, 0x45, 0x5F, 0x53, 0x45, 0x4C, 0x45, 0x43, 0x54, 0x5F, 0x54, 0x48, 0x41, 0x4E, 0x4B
.byte 0x53, 0x3A, 0x0A, 0x00, 0x8D, 0x87, 0x90, 0xAC, 0x81, 0x46, 0x00, 0x00, 0x5B, 0x43, 0x53, 0x3A
.byte 0x53, 0x3A, 0x0A, 0x00
.global OVERLAY21_JP_STRING
OVERLAY21_JP_STRING:
.byte 0x8D, 0x87, 0x90, 0xAC, 0x81, 0x46, 0x00, 0x00
.global ov21_0238CF24
ov21_0238CF24:
.byte 0x5B, 0x43, 0x53, 0x3A
.byte 0x56, 0x5D, 0x5B, 0x67, 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00
.data

1859
asm/overlay_22.s
View File

File diff suppressed because it is too large Load Diff

682
asm/overlay_23.s
View File

File diff suppressed because it is too large Load Diff

114
asm/overlay_24.s
View File

@@ -110,7 +110,7 @@ _0238A2B4:
mov r0, #3
ldmia sp!, {r3, pc}
_0238A2C0:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238A604
ldr r0, _0238A60C ; =ov24_0238C600
@@ -325,7 +325,7 @@ _0238A598:
bl ov24_0238A610
b _0238A604
_0238A5B8:
bl ov00_0230D220
bl ov11_0230D220
cmp r0, #0
bne _0238A604
ldr r0, _0238A60C ; =ov24_0238C600
@@ -356,7 +356,7 @@ ov24_0238A610: ; 0x0238A610
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r1, _0238B384 ; =ov24_0238C600
ldr r3, _0238B388 ; =0x0238C50A
ldr r3, _0238B388 ; =ov24_0238C50A
ldr r1, [r1]
add r2, sp, #8
str r0, [r1]
@@ -484,10 +484,10 @@ _0238A7E4:
bl ShowMessageInDBox
b _0238B37C
_0238A800:
ldr r0, _0238B3A0 ; =0x0238C5C0
ldr r0, _0238B3A0 ; =DAYCARE_D_BOX_LAYOUT_4
mov r4, #4
ldr r1, _0238B3A4 ; =0x00300013
ldr r3, _0238B3A8 ; =0x0238C538
ldr r3, _0238B3A8 ; =DAYCARE_MAIN_MENU
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -855,7 +855,7 @@ _0238ACE0:
b _0238B37C
_0238AD90:
mov r0, #0
ldr r3, _0238B3CC ; =0x0238C520
ldr r3, _0238B3CC ; =DAYCARE_MENU_CONFIRM
mov r2, r0
mov r1, #0x11
str r0, [sp]
@@ -900,7 +900,7 @@ ov24_0238ADFC: ; 0x0238ADFC
str r2, [sp]
str r0, [sp, #4]
ldr r0, _0238B384 ; =ov24_0238C600
ldr r3, _0238B3D0 ; =0x0238C508
ldr r3, _0238B3D0 ; =OVERLAY24_UNKNOWN_STRUCT__NA_238C508
ldr r2, [r0]
add r0, r2, #0x248
add r2, r2, #0x42
@@ -958,7 +958,7 @@ _0238AF00:
bl Rand16Bit
mov r1, #0x64
bl __divsi3
ldr r0, _0238B3D8 ; =0x020A1868
ldr r0, _0238B3D8 ; =_020A1868
ldrsh r0, [r0]
cmp r1, r0
bge _0238B094
@@ -1047,7 +1047,7 @@ _0238AFC0:
strh r2, [sp, #0x18]
add r0, r0, #0x7a
strh r1, [sp, #0x16]
ldr r2, _0238B3E0 ; =0x0238C514
ldr r2, _0238B3E0 ; =OVERLAY24_UNKNOWN_STRUCT__NA_238C514
add r1, sp, #0x14
add r0, r0, #0x100
bl sub_0200D670
@@ -1103,7 +1103,7 @@ _0238B114:
mov r2, #1
str r2, [sp]
ldr r1, _0238B384 ; =ov24_0238C600
ldr r2, _0238B3D0 ; =0x0238C508
ldr r2, _0238B3D0 ; =OVERLAY24_UNKNOWN_STRUCT__NA_238C508
ldr r1, [r1]
add r3, sp, #8
add r1, r1, #0x42
@@ -1123,13 +1123,13 @@ _0238B170:
mov r2, #0xa
bl StrncpySimple
ldr r2, _0238B384 ; =ov24_0238C600
ldr r0, _0238B3E4 ; =0x020A18B8
ldr r0, _0238B3E4 ; =EGG_HP_BONUS
ldr r1, [r2]
ldrsh r3, [r0]
ldr lr, [r1, #0x1e8]
ldr r1, _0238B3E8 ; =0x020A18DC
ldr r1, _0238B3E8 ; =EGG_STAT_BONUSES
ldrsh r4, [lr, #0xa]
ldr r0, _0238B3EC ; =0x020A18E0
ldr r0, _0238B3EC ; =_020A18E0
ldrsh ip, [r1]
add r3, r4, r3
strh r3, [lr, #0xa]
@@ -1259,15 +1259,15 @@ _0238B37C:
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238B384: .word ov24_0238C600
_0238B388: .word 0x0238C50A
_0238B388: .word ov24_0238C50A
_0238B38C: .word 0x00003018
_0238B390: .word 0x0000038A
_0238B394: .word 0x0000038B
_0238B398: .word 0x00003008
_0238B39C: .word 0x0000038F
_0238B3A0: .word 0x0238C5C0
_0238B3A0: .word DAYCARE_D_BOX_LAYOUT_4
_0238B3A4: .word 0x00300013
_0238B3A8: .word 0x0238C538
_0238B3A8: .word DAYCARE_MAIN_MENU
_0238B3AC: .word 0x00000391
_0238B3B0: .word 0x0000220F
_0238B3B4: .word 0x00000392
@@ -1276,15 +1276,15 @@ _0238B3BC: .word 0x00000397
_0238B3C0: .word 0x00000396
_0238B3C4: .word 0x00000715
_0238B3C8: .word 0x00000395
_0238B3CC: .word 0x0238C520
_0238B3D0: .word 0x0238C508
_0238B3CC: .word DAYCARE_MENU_CONFIRM
_0238B3D0: .word OVERLAY24_UNKNOWN_STRUCT__NA_238C508
_0238B3D4: .word 0x000003A2
_0238B3D8: .word 0x020A1868
_0238B3D8: .word _020A1868
_0238B3DC: .word 0x000003A1
_0238B3E0: .word 0x0238C514
_0238B3E4: .word 0x020A18B8
_0238B3E8: .word 0x020A18DC
_0238B3EC: .word 0x020A18E0
_0238B3E0: .word OVERLAY24_UNKNOWN_STRUCT__NA_238C514
_0238B3E4: .word EGG_HP_BONUS
_0238B3E8: .word EGG_STAT_BONUSES
_0238B3EC: .word _020A18E0
_0238B3F0: .word 0x00000399
_0238B3F4: .word 0x000003A3
arm_func_end ov24_0238ADFC
@@ -1293,7 +1293,7 @@ _0238B3F4: .word 0x000003A3
ov24_0238B3F8: ; 0x0238B3F8
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0x1c
ldr r3, _0238C160 ; =0x0238C50A
ldr r3, _0238C160 ; =ov24_0238C50A
add r2, sp, #0x12
mov r1, #4
_0238B40C:
@@ -1419,10 +1419,10 @@ _0238B5C0:
bl ShowMessageInDBox
b _0238C158
_0238B5DC:
ldr r0, _0238C17C ; =0x0238C5C0
ldr r0, _0238C17C ; =DAYCARE_D_BOX_LAYOUT_4
mov r4, #4
ldr r1, _0238C180 ; =0x00300013
ldr r3, _0238C184 ; =0x0238C538
ldr r3, _0238C184 ; =DAYCARE_MAIN_MENU
mov r2, #0
str r4, [sp]
bl CreateNormalMenu
@@ -1790,7 +1790,7 @@ _0238BABC:
b _0238C158
_0238BB6C:
mov r0, #0
ldr r3, _0238C1A8 ; =0x0238C520
ldr r3, _0238C1A8 ; =DAYCARE_MENU_CONFIRM
mov r2, r0
mov r1, #0x11
str r0, [sp]
@@ -1831,7 +1831,7 @@ _0238BB94:
str r2, [sp]
str r0, [sp, #4]
ldr r0, _0238C164 ; =ov24_0238C600
ldr r3, _0238C1AC ; =0x0238C508
ldr r3, _0238C1AC ; =OVERLAY24_UNKNOWN_STRUCT__NA_238C508
ldr r2, [r0]
add r0, r2, #0x248
add r2, r2, #0x42
@@ -1889,7 +1889,7 @@ _0238BCDC:
bl Rand16Bit
mov r1, #0x64
bl __divsi3
ldr r0, _0238C1B4 ; =0x020A1868
ldr r0, _0238C1B4 ; =_020A1868
ldrsh r0, [r0]
cmp r1, r0
bge _0238BE70
@@ -1978,7 +1978,7 @@ _0238BD9C:
strh r2, [sp, #0xc]
add r0, r0, #0x7a
strh r1, [sp, #0xa]
ldr r2, _0238C1BC ; =0x0238C514
ldr r2, _0238C1BC ; =OVERLAY24_UNKNOWN_STRUCT__NA_238C514
add r1, sp, #8
add r0, r0, #0x100
bl sub_0200D670
@@ -2034,7 +2034,7 @@ _0238BEF0:
mov r2, #1
str r2, [sp]
ldr r1, _0238C164 ; =ov24_0238C600
ldr r2, _0238C1AC ; =0x0238C508
ldr r2, _0238C1AC ; =OVERLAY24_UNKNOWN_STRUCT__NA_238C508
ldr r1, [r1]
add r3, sp, #0x12
add r1, r1, #0x42
@@ -2054,13 +2054,13 @@ _0238BF4C:
mov r2, #0xa
bl StrncpySimple
ldr r2, _0238C164 ; =ov24_0238C600
ldr r0, _0238C1C0 ; =0x020A18B8
ldr r0, _0238C1C0 ; =EGG_HP_BONUS
ldr r1, [r2]
ldrsh r3, [r0]
ldr lr, [r1, #0x1e8]
ldr r1, _0238C1C4 ; =0x020A18DC
ldr r1, _0238C1C4 ; =EGG_STAT_BONUSES
ldrsh r4, [lr, #0xa]
ldr r0, _0238C1C8 ; =0x020A18E0
ldr r0, _0238C1C8 ; =_020A18E0
ldrsh ip, [r1]
add r3, r4, r3
strh r3, [lr, #0xa]
@@ -2189,16 +2189,16 @@ _0238C158:
add sp, sp, #0x1c
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238C160: .word 0x0238C50A
_0238C160: .word ov24_0238C50A
_0238C164: .word ov24_0238C600
_0238C168: .word 0x00003018
_0238C16C: .word 0x0000038A
_0238C170: .word 0x0000038B
_0238C174: .word 0x00003008
_0238C178: .word 0x0000038F
_0238C17C: .word 0x0238C5C0
_0238C17C: .word DAYCARE_D_BOX_LAYOUT_4
_0238C180: .word 0x00300013
_0238C184: .word 0x0238C538
_0238C184: .word DAYCARE_MAIN_MENU
_0238C188: .word 0x00000391
_0238C18C: .word 0x0000220F
_0238C190: .word 0x00000392
@@ -2207,15 +2207,15 @@ _0238C198: .word 0x00000397
_0238C19C: .word 0x00000396
_0238C1A0: .word 0x00000715
_0238C1A4: .word 0x00000395
_0238C1A8: .word 0x0238C520
_0238C1AC: .word 0x0238C508
_0238C1A8: .word DAYCARE_MENU_CONFIRM
_0238C1AC: .word OVERLAY24_UNKNOWN_STRUCT__NA_238C508
_0238C1B0: .word 0x000003A2
_0238C1B4: .word 0x020A1868
_0238C1B4: .word _020A1868
_0238C1B8: .word 0x000003A1
_0238C1BC: .word 0x0238C514
_0238C1C0: .word 0x020A18B8
_0238C1C4: .word 0x020A18DC
_0238C1C8: .word 0x020A18E0
_0238C1BC: .word OVERLAY24_UNKNOWN_STRUCT__NA_238C514
_0238C1C0: .word EGG_HP_BONUS
_0238C1C4: .word EGG_STAT_BONUSES
_0238C1C8: .word _020A18E0
_0238C1CC: .word 0x00000399
_0238C1D0: .word 0x000003A3
arm_func_end ov24_0238B3F8
@@ -2405,7 +2405,7 @@ _0238C43C:
strb r1, [r0, #0x28d]
b _0238C470
_0238C464:
bl ov00_022E6E68
bl ov11_022E6E68
mov r0, #4
ldmia sp!, {r3, pc}
_0238C470:
@@ -2461,9 +2461,22 @@ _0238C504: .word ov24_0238C600
arm_func_end ov24_0238C4CC
; 0x0238C508
.byte 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x86, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.global OVERLAY24_UNKNOWN_STRUCT__NA_238C508
OVERLAY24_UNKNOWN_STRUCT__NA_238C508:
.byte 0xF8, 0x00
.global ov24_0238C50A
ov24_0238C50A:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global OVERLAY24_UNKNOWN_STRUCT__NA_238C514
OVERLAY24_UNKNOWN_STRUCT__NA_238C514:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global DAYCARE_MENU_CONFIRM
DAYCARE_MENU_CONFIRM:
.byte 0x86, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x87, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global DAYCARE_MAIN_MENU
DAYCARE_MAIN_MENU:
.byte 0x8C, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x8D, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
.byte 0x8E, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x8A, 0x03, 0x8B, 0x03, 0x8C, 0x03, 0x8D, 0x03, 0x8E, 0x03, 0x8F, 0x03, 0x90, 0x03, 0x91, 0x03
@@ -2472,10 +2485,13 @@ _0238C504: .word ov24_0238C600
.byte 0xA2, 0x03, 0xA3, 0x03, 0xA4, 0x03, 0xA5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x10
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x0A, 0x08, 0x03
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x0F, 0x08, 0x03
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global DAYCARE_D_BOX_LAYOUT_4
DAYCARE_D_BOX_LAYOUT_4:
.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x04
.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.data
.global ov24_0238C600
ov24_0238C600:

100
asm/overlay_25.s
View File

@@ -473,16 +473,16 @@ _0238A734:
bl ShowPortraitBox
b _0238B0C8
_0238A7E4:
ldr r0, _0238B0DC ; =0x0238B4A4
ldr r0, _0238B0DC ; =APPRAISAL_D_BOX_LAYOUT_1
ldr r1, _0238B0E0 ; =ov25_0238B414
bl sub_0202F8C4
ldr r2, _0238B0D0 ; =ov25_0238B5E0
ldr r1, _0238B0E4 ; =0x00300013
ldr r2, [r2]
ldr r3, _0238B0E8 ; =0x0238B4CC
ldr r3, _0238B0E8 ; =APPRAISAL_MAIN_MENU
strb r0, [r2, #0x13d]
mov ip, #4
ldr r0, _0238B0EC ; =0x0238B564
ldr r0, _0238B0EC ; =APPRAISAL_D_BOX_LAYOUT_5
mov r2, #0
str ip, [sp]
bl CreateNormalMenu
@@ -850,8 +850,8 @@ _0238AD48:
b _0238B0C8
_0238AD8C:
mov r2, #0x96
ldr r0, _0238B104 ; =0x0238B574
ldr r3, _0238B108 ; =0x0238B4EC
ldr r0, _0238B104 ; =APPRAISAL_D_BOX_LAYOUT_6
ldr r3, _0238B108 ; =APPRAISAL_SUBMENU
str r2, [r1, #0x4c]
mov ip, #3
mov r1, #0x13
@@ -864,7 +864,7 @@ _0238AD8C:
b _0238B0C8
_0238ADC0:
ldrh r0, [r1, #0xe]
ldr r2, _0238B10C ; =0x0238B5A4
ldr r2, _0238B10C ; =ov25_0238B5A4
ldr r3, _0238B110 ; =0x0000C402
str r0, [r1, #0x28]
ldr lr, [ip]
@@ -888,7 +888,7 @@ ov25_0238ADFC: ; 0x0238ADFC
ldr r0, _0238B0D0 ; =ov25_0238B5E0
add r1, sp, #0x18
ldr ip, [r0]
ldr r0, _0238B114 ; =0x0238B594
ldr r0, _0238B114 ; =APPRAISAL_D_BOX_LAYOUT_8
add r2, ip, #0x78
str r2, [sp, #0x50]
str r1, [sp]
@@ -945,15 +945,15 @@ _0238AE64:
bl ShowMessageInDBox
b _0238B0C8
_0238AEF0:
ldr r0, _0238B0DC ; =0x0238B4A4
ldr r0, _0238B0DC ; =APPRAISAL_D_BOX_LAYOUT_1
ldr r1, _0238B0E0 ; =ov25_0238B414
bl sub_0202F8C4
ldr r1, _0238B0D0 ; =ov25_0238B5E0
ldr r3, _0238B120 ; =0x0238B4B4
ldr r3, _0238B120 ; =APPRAISAL_MENU_CONFIRM
ldr r1, [r1]
mov ip, #2
strb r0, [r1, #0x13d]
ldr r0, _0238B124 ; =0x0238B584
ldr r0, _0238B124 ; =APPRAISAL_D_BOX_LAYOUT_7
mov r1, #0x80000013
mov r2, #0
str ip, [sp]
@@ -1036,7 +1036,7 @@ _0238B00C:
add r1, sp, #0xc
str r3, [r2, #0x24]
ldr r0, [r0]
ldr r2, _0238B12C ; =0x0238B498
ldr r2, _0238B12C ; =OVERLAY25_UNKNOWN_STRUCT__NA_238B498
add r0, r0, #0xb8
bl sub_0200D670
ldr r0, _0238B0D0 ; =ov25_0238B5E0
@@ -1076,27 +1076,27 @@ _0238B0C8:
_0238B0D0: .word ov25_0238B5E0
_0238B0D4: .word 0x00003008
_0238B0D8: .word 0x000003D7
_0238B0DC: .word 0x0238B4A4
_0238B0DC: .word APPRAISAL_D_BOX_LAYOUT_1
_0238B0E0: .word ov25_0238B414
_0238B0E4: .word 0x00300013
_0238B0E8: .word 0x0238B4CC
_0238B0EC: .word 0x0238B564
_0238B0E8: .word APPRAISAL_MAIN_MENU
_0238B0EC: .word APPRAISAL_D_BOX_LAYOUT_5
_0238B0F0: .word 0x000003DD
_0238B0F4: .word 0x00003018
_0238B0F8: .word 0x000003E5
_0238B0FC: .word 0x000003D9
_0238B100: .word 0x000003DF
_0238B104: .word 0x0238B574
_0238B108: .word 0x0238B4EC
_0238B10C: .word 0x0238B5A4
_0238B104: .word APPRAISAL_D_BOX_LAYOUT_6
_0238B108: .word APPRAISAL_SUBMENU
_0238B10C: .word ov25_0238B5A4
_0238B110: .word 0x0000C402
_0238B114: .word 0x0238B594
_0238B114: .word APPRAISAL_D_BOX_LAYOUT_8
_0238B118: .word 0x00001013
_0238B11C: .word 0x0000033E
_0238B120: .word 0x0238B4B4
_0238B124: .word 0x0238B584
_0238B120: .word APPRAISAL_MENU_CONFIRM
_0238B124: .word APPRAISAL_D_BOX_LAYOUT_7
_0238B128: .word 0x0000018F
_0238B12C: .word 0x0238B498
_0238B12C: .word OVERLAY25_UNKNOWN_STRUCT__NA_238B498
_0238B130: .word 0x000003E1
arm_func_end ov25_0238ADFC
@@ -1181,7 +1181,7 @@ _0238B214: ; jump table
_0238B238:
mov r0, #4
str r0, [r2, #0x24]
bl ov00_022E6E68
bl ov11_022E6E68
b _0238B374
_0238B248:
bl ov25_0238A140
@@ -1326,7 +1326,7 @@ ov25_0238B414: ; 0x0238B414
add ip, sp, #0x400
str r0, [sp, #0x428]
add ip, ip, #4
ldr r2, _0238B48C ; =0x0238B5B0
ldr r2, _0238B48C ; =ov25_0238B5B0
ldr r3, _0238B490 ; =0x0000C402
add r0, sp, #4
mov r1, #0x100
@@ -1348,30 +1348,62 @@ ov25_0238B414: ; 0x0238B414
add sp, sp, #0x400
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238B48C: .word 0x0238B5B0
_0238B48C: .word ov25_0238B5B0
_0238B490: .word 0x0000C402
_0238B494: .word 0x00000225
arm_func_end ov25_0238B414
; 0x0238B498
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x03, 0x00, 0x00
.global OVERLAY25_UNKNOWN_STRUCT__NA_238B498
OVERLAY25_UNKNOWN_STRUCT__NA_238B498:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global APPRAISAL_D_BOX_LAYOUT_1
APPRAISAL_D_BOX_LAYOUT_1:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global APPRAISAL_MENU_CONFIRM
APPRAISAL_MENU_CONFIRM:
.byte 0xD1, 0x03, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0xD2, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0xD3, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.global APPRAISAL_MAIN_MENU
APPRAISAL_MAIN_MENU:
.byte 0xD3, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0xD6, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0xDA, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.global APPRAISAL_SUBMENU
APPRAISAL_SUBMENU:
.byte 0xDA, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD5, 0x03, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0xE6, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0xD3, 0x03, 0xD4, 0x03, 0xD5, 0x03, 0xD6, 0x03, 0xD7, 0x03, 0xD8, 0x03
.byte 0xD9, 0x03, 0xDA, 0x03, 0xDB, 0x03, 0xDC, 0x03, 0xDD, 0x03, 0xDE, 0x03, 0xDF, 0x03, 0xE0, 0x03
.byte 0xE1, 0x03, 0xE4, 0x03, 0xE5, 0x03, 0xE2, 0x03, 0xE3, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x12, 0x10, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x0A, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x0F, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x18, 0x0B, 0x06, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x69, 0x74, 0x65
.byte 0x6D, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x43, 0x53, 0x3A, 0x56, 0x5D, 0x5B, 0x67
.byte 0x16, 0x0F, 0x08, 0x03, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global APPRAISAL_D_BOX_LAYOUT_5
APPRAISAL_D_BOX_LAYOUT_5:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x1E, 0x0F, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global APPRAISAL_D_BOX_LAYOUT_6
APPRAISAL_D_BOX_LAYOUT_6:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x16, 0x02, 0x08, 0x05, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global APPRAISAL_D_BOX_LAYOUT_7
APPRAISAL_D_BOX_LAYOUT_7:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x18, 0x0B, 0x06, 0x04, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global APPRAISAL_D_BOX_LAYOUT_8
APPRAISAL_D_BOX_LAYOUT_8:
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x02, 0x18, 0x13, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B5A4
ov25_0238B5A4:
.byte 0x5B, 0x69, 0x74, 0x65
.byte 0x6D, 0x3A, 0x30, 0x5D, 0x00, 0x00, 0x00, 0x00
.global ov25_0238B5B0
ov25_0238B5B0:
.byte 0x5B, 0x43, 0x53, 0x3A, 0x56, 0x5D, 0x5B, 0x67
.byte 0x6F, 0x6C, 0x64, 0x3A, 0x30, 0x5D, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00
.data

223
asm/overlay_26.s
View File

@@ -129,35 +129,35 @@ _0238A2E8: ; jump table
b _0238A3A0 ; case 11
b _0238A4C4 ; case 12
_0238A31C:
ldr r0, _0238A534 ; =0x0238AE92
ldr r0, _0238A534 ; =ov26_0238AE92
str r0, [r1, #0x94]
b _0238A50C
_0238A328:
ldr r0, _0238A538 ; =0x0238AE86
ldr r0, _0238A538 ; =ov26_0238AE86
str r0, [r1, #0x94]
b _0238A50C
_0238A334:
ldr r0, _0238A53C ; =0x0238AE7A
ldr r0, _0238A53C ; =ov26_0238AE7A
str r0, [r1, #0x94]
b _0238A50C
_0238A340:
ldr r0, _0238A540 ; =0x0238AE6E
ldr r0, _0238A540 ; =ov26_0238AE6E
str r0, [r1, #0x94]
b _0238A50C
_0238A34C:
ldr r0, _0238A544 ; =0x0238AE56
ldr r0, _0238A544 ; =ov26_0238AE56
str r0, [r1, #0x94]
b _0238A50C
_0238A358:
ldr r0, _0238A548 ; =0x0238AE62
ldr r0, _0238A548 ; =ov26_0238AE62
str r0, [r1, #0x94]
b _0238A50C
_0238A364:
ldr r0, _0238A54C ; =0x0238AE4A
ldr r0, _0238A54C ; =ov26_0238AE4A
str r0, [r1, #0x94]
b _0238A50C
_0238A370:
ldr r0, _0238A550 ; =0x0238AE3E
ldr r0, _0238A550 ; =ov26_0238AE3E
str r0, [r1, #0x94]
b _0238A50C
_0238A37C:
@@ -167,7 +167,7 @@ _0238A37C:
mov r2, #0x1f8
strh r2, [r1, #0x60]
ldr r0, [r0]
ldr r1, _0238A554 ; =0x0238AE32
ldr r1, _0238A554 ; =ov26_0238AE32
str r1, [r0, #0x94]
b _0238A50C
_0238A3A0:
@@ -185,11 +185,11 @@ _0238A3A0:
ldr r2, [r0]
ldr r1, [r2, #0x98]
cmp r1, #0
ldreq r0, _0238A558 ; =0x0238AE9E
ldreq r0, _0238A558 ; =ov26_0238AE9E
streq r0, [r2, #0x94]
beq _0238A50C
ldr r4, [r2, #0x88]
ldr r1, _0238A55C ; =0x0238AE20
ldr r1, _0238A55C ; =OVERLAY26_UNKNOWN_TABLE__NA_238AE20
str r1, [r2, #0x94]
ldr r0, [r0]
add r0, r0, #0x60
@@ -261,7 +261,7 @@ _0238A4C4:
mov r3, #0
strh r2, [r1, #0x60]
ldr r2, [r0]
ldr r1, _0238A55C ; =0x0238AE20
ldr r1, _0238A55C ; =OVERLAY26_UNKNOWN_TABLE__NA_238AE20
strb r3, [r2, #0x62]
ldr r2, [r0]
str r4, [r2, #0x88]
@@ -269,7 +269,7 @@ _0238A4C4:
str r1, [r0, #0x94]
b _0238A50C
_0238A504:
ldr r0, _0238A564 ; =0x0238AE26
ldr r0, _0238A564 ; =ov26_0238AE26
str r0, [r1, #0x94]
_0238A50C:
ldr r1, _0238A530 ; =ov26_0238AF60
@@ -284,19 +284,19 @@ _0238A528:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0238A530: .word ov26_0238AF60
_0238A534: .word 0x0238AE92
_0238A538: .word 0x0238AE86
_0238A53C: .word 0x0238AE7A
_0238A540: .word 0x0238AE6E
_0238A544: .word 0x0238AE56
_0238A548: .word 0x0238AE62
_0238A54C: .word 0x0238AE4A
_0238A550: .word 0x0238AE3E
_0238A554: .word 0x0238AE32
_0238A558: .word 0x0238AE9E
_0238A55C: .word 0x0238AE20
_0238A534: .word ov26_0238AE92
_0238A538: .word ov26_0238AE86
_0238A53C: .word ov26_0238AE7A
_0238A540: .word ov26_0238AE6E
_0238A544: .word ov26_0238AE56
_0238A548: .word ov26_0238AE62
_0238A54C: .word ov26_0238AE4A
_0238A550: .word ov26_0238AE3E
_0238A554: .word ov26_0238AE32
_0238A558: .word ov26_0238AE9E
_0238A55C: .word OVERLAY26_UNKNOWN_TABLE__NA_238AE20
_0238A560: .word 0x000001E3
_0238A564: .word 0x0238AE26
_0238A564: .word ov26_0238AE26
arm_func_end ov26_0238A468
arm_func_start ov26_0238A568
@@ -605,36 +605,36 @@ ov26_0238A970: ; 0x0238A970
mov r0, #8
mov r1, r0
bl MemAlloc
ldr r1, _0238A998 ; =0x0238AF64
ldr r1, _0238A998 ; =ov26_0238AF64
mov r2, #0
str r0, [r1]
str r2, [r0, #4]
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238A998: .word 0x0238AF64
_0238A998: .word ov26_0238AF64
arm_func_end ov26_0238A970
arm_func_start ov26_0238A99C
ov26_0238A99C: ; 0x0238A99C
stmdb sp!, {r3, lr}
ldr r0, _0238A9C4 ; =0x0238AF64
ldr r0, _0238A9C4 ; =ov26_0238AF64
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238A9C4 ; =0x0238AF64
ldr r0, _0238A9C4 ; =ov26_0238AF64
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238A9C4: .word 0x0238AF64
_0238A9C4: .word ov26_0238AF64
arm_func_end ov26_0238A99C
arm_func_start ov26_0238A9C8
ov26_0238A9C8: ; 0x0238A9C8
stmdb sp!, {r4, lr}
ldr r0, _0238AA64 ; =0x0238AF64
ldr r0, _0238AA64 ; =ov26_0238AF64
ldr r0, [r0]
ldr r0, [r0, #4]
cmp r0, #0
@@ -678,7 +678,7 @@ _0238AA5C:
mov r0, #1
ldmia sp!, {r4, pc}
.align 2, 0
_0238AA64: .word 0x0238AF64
_0238AA64: .word ov26_0238AF64
arm_func_end ov26_0238A9C8
arm_func_start ov26_0238AA68
@@ -687,37 +687,37 @@ ov26_0238AA68: ; 0x0238AA68
mov r0, #8
mov r1, r0
bl MemAlloc
ldr r1, _0238AA90 ; =0x0238AF68
ldr r1, _0238AA90 ; =ov26_0238AF68
mov r2, #0
str r0, [r1]
str r2, [r0, #4]
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238AA90: .word 0x0238AF68
_0238AA90: .word ov26_0238AF68
arm_func_end ov26_0238AA68
arm_func_start ov26_0238AA94
ov26_0238AA94: ; 0x0238AA94
stmdb sp!, {r3, lr}
ldr r0, _0238AABC ; =0x0238AF68
ldr r0, _0238AABC ; =ov26_0238AF68
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238AABC ; =0x0238AF68
ldr r0, _0238AABC ; =ov26_0238AF68
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238AABC: .word 0x0238AF68
_0238AABC: .word ov26_0238AF68
arm_func_end ov26_0238AA94
arm_func_start ov26_0238AAC0
ov26_0238AAC0: ; 0x0238AAC0
stmdb sp!, {r3, r4, lr}
sub sp, sp, #4
ldr r0, _0238AC04 ; =0x0238AF68
ldr r0, _0238AC04 ; =ov26_0238AF68
ldr r0, [r0]
ldr r0, [r0, #4]
cmp r0, #3
@@ -732,7 +732,7 @@ _0238AAF0:
bl sub_0205633C
cmp r0, #0
bne _0238AB08
bl ov00_022E6E68
bl ov11_022E6E68
mov r0, #4
b _0238ABFC
_0238AB08:
@@ -759,7 +759,7 @@ _0238AB34:
sub r0, r1, #8
cmp r0, #1
bhi _0238AB70
ldr r0, _0238AC08 ; =0x0238AEAC
ldr r0, _0238AC08 ; =ov26_0238AEAC
bl DebugPrint0
bl IncrementNbAdventures
bl IncrementNbDungeonsCleared
@@ -768,25 +768,25 @@ _0238AB70:
sub r0, r1, #0xa
cmp r0, #1
bhi _0238AB90
ldr r0, _0238AC0C ; =0x0238AEE4
ldr r0, _0238AC0C ; =ov26_0238AEE4
bl DebugPrint0
bl IncrementNbAdventures
bl IncrementNbFainted
b _0238AB98
_0238AB90:
ldr r0, _0238AC10 ; =0x0238AF18
ldr r0, _0238AC10 ; =ov26_0238AF18
bl DebugPrint0
_0238AB98:
mov r0, r4
bl sub_020587E0
ldr r0, _0238AC04 ; =0x0238AF68
ldr r0, _0238AC04 ; =ov26_0238AF68
mov r1, #1
ldr r0, [r0]
str r1, [r0, #4]
b _0238ABF8
_0238ABB4:
bl ov10_022BD56C
ldr r0, _0238AC04 ; =0x0238AF68
ldr r0, _0238AC04 ; =ov26_0238AF68
mov r1, #2
ldr r0, [r0]
str r1, [r0, #4]
@@ -795,13 +795,13 @@ _0238ABC8:
cmp r0, #1
beq _0238ABF8
bl ov10_022BD718
ldr r0, _0238AC04 ; =0x0238AF68
ldr r0, _0238AC04 ; =ov26_0238AF68
mov r1, #3
ldr r0, [r0]
str r1, [r0, #4]
b _0238ABF8
_0238ABEC:
bl ov00_022E6E68
bl ov11_022E6E68
mov r0, #4
b _0238ABFC
_0238ABF8:
@@ -810,10 +810,10 @@ _0238ABFC:
add sp, sp, #4
ldmia sp!, {r3, r4, pc}
.align 2, 0
_0238AC04: .word 0x0238AF68
_0238AC08: .word 0x0238AEAC
_0238AC0C: .word 0x0238AEE4
_0238AC10: .word 0x0238AF18
_0238AC04: .word ov26_0238AF68
_0238AC08: .word ov26_0238AEAC
_0238AC0C: .word ov26_0238AEE4
_0238AC10: .word ov26_0238AF18
arm_func_end ov26_0238AAC0
arm_func_start ov26_0238AC14
@@ -822,36 +822,36 @@ ov26_0238AC14: ; 0x0238AC14
mov r0, #8
mov r1, r0
bl MemAlloc
ldr r1, _0238AC3C ; =0x0238AF6C
ldr r1, _0238AC3C ; =ov26_0238AF6C
mov r2, #0
str r0, [r1]
str r2, [r0, #4]
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238AC3C: .word 0x0238AF6C
_0238AC3C: .word ov26_0238AF6C
arm_func_end ov26_0238AC14
arm_func_start ov26_0238AC40
ov26_0238AC40: ; 0x0238AC40
stmdb sp!, {r3, lr}
ldr r0, _0238AC68 ; =0x0238AF6C
ldr r0, _0238AC68 ; =ov26_0238AF6C
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238AC68 ; =0x0238AF6C
ldr r0, _0238AC68 ; =ov26_0238AF6C
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238AC68: .word 0x0238AF6C
_0238AC68: .word ov26_0238AF6C
arm_func_end ov26_0238AC40
arm_func_start ov26_0238AC6C
ov26_0238AC6C: ; 0x0238AC6C
stmdb sp!, {r3, lr}
ldr r0, _0238ACD4 ; =0x0238AF6C
ldr r0, _0238ACD4 ; =ov26_0238AF6C
ldr r0, [r0]
ldr r0, [r0, #4]
cmp r0, #0
@@ -868,20 +868,20 @@ _0238AC90:
ldmia sp!, {r3, pc}
_0238ACA8:
bl sub_020587C8
ldr r0, _0238ACD4 ; =0x0238AF6C
ldr r0, _0238ACD4 ; =ov26_0238AF6C
mov r1, #1
ldr r0, [r0]
str r1, [r0, #4]
b _0238ACCC
_0238ACC0:
bl ov00_022E6E68
bl ov11_022E6E68
mov r0, #4
ldmia sp!, {r3, pc}
_0238ACCC:
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238ACD4: .word 0x0238AF6C
_0238ACD4: .word ov26_0238AF6C
arm_func_end ov26_0238AC6C
arm_func_start ov26_0238ACD8
@@ -890,7 +890,7 @@ ov26_0238ACD8: ; 0x0238ACD8
mov r0, #8
mov r1, r0
bl MemAlloc
ldr r1, _0238AD0C ; =0x0238AF70
ldr r1, _0238AD0C ; =ov26_0238AF70
mov r2, #0
str r0, [r1]
str r2, [r0]
@@ -900,30 +900,30 @@ ov26_0238ACD8: ; 0x0238ACD8
mov r0, #1
ldmia sp!, {r3, pc}
.align 2, 0
_0238AD0C: .word 0x0238AF70
_0238AD0C: .word ov26_0238AF70
arm_func_end ov26_0238ACD8
arm_func_start ov26_0238AD10
ov26_0238AD10: ; 0x0238AD10
stmdb sp!, {r3, lr}
ldr r0, _0238AD38 ; =0x0238AF70
ldr r0, _0238AD38 ; =ov26_0238AF70
ldr r0, [r0]
cmp r0, #0
ldmeqia sp!, {r3, pc}
bl MemFree
ldr r0, _0238AD38 ; =0x0238AF70
ldr r0, _0238AD38 ; =ov26_0238AF70
mov r1, #0
str r1, [r0]
ldmia sp!, {r3, pc}
.align 2, 0
_0238AD38: .word 0x0238AF70
_0238AD38: .word ov26_0238AF70
arm_func_end ov26_0238AD10
arm_func_start ov26_0238AD3C
ov26_0238AD3C: ; 0x0238AD3C
stmdb sp!, {r3, lr}
sub sp, sp, #0xe8
ldr r0, _0238AE1C ; =0x0238AF70
ldr r0, _0238AE1C ; =ov26_0238AF70
ldr r2, [r0]
ldr r1, [r2]
cmp r1, #3
@@ -938,14 +938,14 @@ _0238AD6C:
add r0, sp, #0
bl sub_0204F244
cmp r0, #0
ldreq r0, _0238AE1C ; =0x0238AF70
ldreq r0, _0238AE1C ; =ov26_0238AF70
moveq r1, #3
ldreq r0, [r0]
streq r1, [r0]
beq _0238AE10
add r0, sp, #0
bl sub_02046698
ldr r0, _0238AE1C ; =0x0238AF70
ldr r0, _0238AE1C ; =ov26_0238AF70
mov r1, #1
ldr r0, [r0]
str r1, [r0]
@@ -961,7 +961,7 @@ _0238ADA8:
mov r0, #0
strh r0, [r1, #4]
bl sub_02046740
ldr r0, _0238AE1C ; =0x0238AF70
ldr r0, _0238AE1C ; =ov26_0238AF70
mov r1, #2
ldr r0, [r0]
str r1, [r0]
@@ -969,14 +969,14 @@ _0238ADA8:
_0238ADE4:
bl sub_0204677C
cmp r0, #0
ldreq r0, _0238AE1C ; =0x0238AF70
ldreq r0, _0238AE1C ; =ov26_0238AF70
moveq r1, #3
ldreq r0, [r0]
streq r1, [r0]
b _0238AE10
_0238AE00:
bl sub_0204665C
bl ov00_022E6E68
bl ov11_022E6E68
mov r0, #4
b _0238AE14
_0238AE10:
@@ -985,26 +985,69 @@ _0238AE14:
add sp, sp, #0xe8
ldmia sp!, {r3, pc}
.align 2, 0
_0238AE1C: .word 0x0238AF70
_0238AE1C: .word ov26_0238AF70
arm_func_end ov26_0238AD3C
; 0x0238AE1C
; 0x0238AE20
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x61, 0x02
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x6C, 0x02, 0xFF, 0x00, 0x18, 0x02
.byte 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x6B, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00
.byte 0x18, 0x32, 0x6A, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x68, 0x02
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x69, 0x02, 0xFF, 0x00, 0x18, 0x02
.byte 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x65, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00
.byte 0x18, 0x32, 0x64, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x63, 0x02
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x62, 0x02, 0xFF, 0x00, 0x18, 0x02
.byte 0x00, 0x00, 0x03, 0x00, 0x18, 0x32, 0x6D, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00
.global OVERLAY26_UNKNOWN_TABLE__NA_238AE20
OVERLAY26_UNKNOWN_TABLE__NA_238AE20:
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE26
ov26_0238AE26:
.byte 0x03, 0x00, 0x18, 0x32, 0x61, 0x02
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE32
ov26_0238AE32:
.byte 0x03, 0x00, 0x18, 0x32, 0x6C, 0x02, 0xFF, 0x00, 0x18, 0x02
.byte 0x00, 0x00
.global ov26_0238AE3E
ov26_0238AE3E:
.byte 0x03, 0x00, 0x18, 0x32, 0x6B, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE4A
ov26_0238AE4A:
.byte 0x03, 0x00
.byte 0x18, 0x32, 0x6A, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE56
ov26_0238AE56:
.byte 0x03, 0x00, 0x18, 0x32, 0x68, 0x02
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE62
ov26_0238AE62:
.byte 0x03, 0x00, 0x18, 0x32, 0x69, 0x02, 0xFF, 0x00, 0x18, 0x02
.byte 0x00, 0x00
.global ov26_0238AE6E
ov26_0238AE6E:
.byte 0x03, 0x00, 0x18, 0x32, 0x65, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE7A
ov26_0238AE7A:
.byte 0x03, 0x00
.byte 0x18, 0x32, 0x64, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE86
ov26_0238AE86:
.byte 0x03, 0x00, 0x18, 0x32, 0x63, 0x02
.byte 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00
.global ov26_0238AE92
ov26_0238AE92:
.byte 0x03, 0x00, 0x18, 0x32, 0x62, 0x02, 0xFF, 0x00, 0x18, 0x02
.byte 0x00, 0x00
.global ov26_0238AE9E
ov26_0238AE9E:
.byte 0x03, 0x00, 0x18, 0x32, 0x6D, 0x02, 0xFF, 0x00, 0x18, 0x02, 0x00, 0x00, 0x00, 0x00
.global ov26_0238AEAC
ov26_0238AEAC:
.byte 0x55, 0x4E, 0x49, 0x54, 0x20, 0x52, 0x45, 0x54, 0x55, 0x52, 0x4E, 0x20, 0x25, 0x33, 0x64, 0x20
.byte 0x63, 0x6F, 0x6E, 0x71, 0x75, 0x65, 0x73, 0x74, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00, 0x00, 0x00, 0x55, 0x4E, 0x49, 0x54, 0x20, 0x52, 0x45, 0x54
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00, 0x00, 0x00
.global ov26_0238AEE4
ov26_0238AEE4:
.byte 0x55, 0x4E, 0x49, 0x54, 0x20, 0x52, 0x45, 0x54
.byte 0x55, 0x52, 0x4E, 0x20, 0x25, 0x33, 0x64, 0x20, 0x64, 0x65, 0x61, 0x64, 0x20, 0x63, 0x6F, 0x75
.byte 0x6E, 0x74, 0x20, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00, 0x00, 0x00, 0x55, 0x4E, 0x49, 0x54
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00, 0x00, 0x00
.global ov26_0238AF18
ov26_0238AF18:
.byte 0x55, 0x4E, 0x49, 0x54
.byte 0x20, 0x52, 0x45, 0x54, 0x55, 0x52, 0x4E, 0x20, 0x25, 0x33, 0x64, 0x20, 0x6E, 0x6F, 0x20, 0x63
.byte 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D
.byte 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x3D, 0x0A, 0x00
@@ -1012,4 +1055,16 @@ _0238AE1C: .word 0x0238AF70
.data
.global ov26_0238AF60
ov26_0238AF60:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global ov26_0238AF64
ov26_0238AF64:
.byte 0x00, 0x00, 0x00, 0x00
.global ov26_0238AF68
ov26_0238AF68:
.byte 0x00, 0x00, 0x00, 0x00
.global ov26_0238AF6C
ov26_0238AF6C:
.byte 0x00, 0x00, 0x00, 0x00
.global ov26_0238AF70
ov26_0238AF70:
.byte 0x00, 0x00, 0x00, 0x00

814
asm/overlay_27.s
View File

File diff suppressed because it is too large Load Diff

61
asm/overlay_28.s
View File

@@ -16,13 +16,13 @@ ov28_0238A140: ; 0x0238A140
ldr r2, [r1]
mov r1, #0xc
mul r3, r2, r1
ldr r1, _0238A180 ; =0x0238AD28
ldr r1, _0238A180 ; =ov28_0238AD28
ldr r1, [r1, r3]
strh r1, [r0, #0x18]
bx lr
.align 2, 0
_0238A17C: .word ov28_0238ADA0
_0238A180: .word 0x0238AD28
_0238A180: .word ov28_0238AD28
arm_func_end ov28_0238A140
arm_func_start ov28_0238A184
@@ -46,7 +46,7 @@ _0238A1B4:
ldr r2, [r0]
mov r0, #0xc
mul r3, r2, r0
ldr r0, _0238A45C ; =0x0238AD24
ldr r0, _0238A45C ; =ov28_0238AD24
ldr r4, [r1]
ldr r1, [r0, r3]
ldrh r2, [r5, #0x18]
@@ -116,7 +116,7 @@ _0238A2A4:
and r0, r0, #0xff
bl sub_02028F88
ldr r2, _0238A454 ; =ov28_0238ADA0
ldr r0, _0238A460 ; =0x0238AD0C
ldr r0, _0238A460 ; =ov28_0238AD0C
ldr r1, [r2]
ldr r3, [r5, #4]
ldr r0, [r0, r1, lsl #2]
@@ -133,7 +133,7 @@ _0238A2A4:
ldr r1, [r2]
mov r0, #0xc
mul r2, r1, r0
ldr r0, _0238A464 ; =0x0238AD2C
ldr r0, _0238A464 ; =ov28_0238AD2C
ldrh r1, [r5, #0x18]
ldr r0, [r0, r2]
cmp r1, r0
@@ -179,7 +179,7 @@ _0238A398:
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238A454 ; =ov28_0238ADA0
ldr r1, _0238A460 ; =0x0238AD0C
ldr r1, _0238A460 ; =ov28_0238AD0C
ldr r0, [r0]
ldr r2, [r5, #4]
ldr r0, [r1, r0, lsl #2]
@@ -222,23 +222,23 @@ _0238A44C:
.align 2, 0
_0238A454: .word ov28_0238ADA0
_0238A458: .word ov28_0238AD80
_0238A45C: .word 0x0238AD24
_0238A460: .word 0x0238AD0C
_0238A464: .word 0x0238AD2C
_0238A45C: .word ov28_0238AD24
_0238A460: .word ov28_0238AD0C
_0238A464: .word ov28_0238AD2C
arm_func_end ov28_0238A184
arm_func_start ov28_0238A468
ov28_0238A468: ; 0x0238A468
stmdb sp!, {r4, lr}
mov r4, r0
ldr r0, _0238A488 ; =0x0238ACFC
ldr r0, _0238A488 ; =ov28_0238ACFC
bl sub_020348E4
cmp r0, #0
ldrne r0, _0238A48C ; =ov28_0238ADA0
strne r4, [r0]
ldmia sp!, {r4, pc}
.align 2, 0
_0238A488: .word 0x0238ACFC
_0238A488: .word ov28_0238ACFC
_0238A48C: .word ov28_0238ADA0
arm_func_end ov28_0238A468
@@ -275,10 +275,10 @@ _0238A4E4:
ldr r1, _0238A580 ; =ov28_0238ADA0
mov r0, #0xc
ldr r2, [r1]
ldr r1, _0238A584 ; =0x0238AD24
ldr r1, _0238A584 ; =ov28_0238AD24
mul r3, r2, r0
ldr r6, [r1, r3]
ldr r0, _0238A588 ; =0x0238AD2C
ldr r0, _0238A588 ; =ov28_0238AD2C
mov r4, r6
ldr r5, [r0, r3]
ldr r7, _0238A57C ; =ov28_0238AD80
@@ -309,8 +309,8 @@ _0238A54C:
_0238A578: .word 0x00003618
_0238A57C: .word ov28_0238AD80
_0238A580: .word ov28_0238ADA0
_0238A584: .word 0x0238AD24
_0238A588: .word 0x0238AD2C
_0238A584: .word ov28_0238AD24
_0238A588: .word ov28_0238AD2C
arm_func_end ov28_0238A490
arm_func_start ov28_0238A58C
@@ -471,7 +471,7 @@ _0238A790:
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r1, _0238AB58 ; =ov28_0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x404]
ldr r0, [r1, r0, lsl #2]
@@ -527,7 +527,7 @@ _0238A87C:
cmp r0, #0
beq _0238A8A4
cmp r0, #1
ldreq r0, _0238AB58 ; =0x0238AD0C
ldreq r0, _0238AB58 ; =ov28_0238AD0C
ldreq r1, [r4, #0x24]
ldreq r0, [r0, r2, lsl #2]
addeq r0, r1, r0
@@ -544,7 +544,7 @@ _0238A8A4:
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r1, _0238AB58 ; =ov28_0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x24]
ldr r0, [r1, r0, lsl #2]
@@ -613,7 +613,7 @@ _0238A9A8:
and r0, r0, #0xff
bl sub_02028F88
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r1, _0238AB58 ; =ov28_0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x440]
ldr r0, [r1, r0, lsl #2]
@@ -638,7 +638,7 @@ _0238A9A8:
b _0238AA48
_0238AA2C:
ldr r0, _0238AB54 ; =ov28_0238ADA0
ldr r1, _0238AB58 ; =0x0238AD0C
ldr r1, _0238AB58 ; =ov28_0238AD0C
ldr r0, [r0]
ldr r2, [r4, #0x440]
ldr r0, [r1, r0, lsl #2]
@@ -728,7 +728,7 @@ _0238AB48:
.align 2, 0
_0238AB50: .word ov28_0238AD80
_0238AB54: .word ov28_0238ADA0
_0238AB58: .word 0x0238AD0C
_0238AB58: .word ov28_0238AD0C
arm_func_end ov28_0238A5CC
arm_func_start ov28_0238AB5C
@@ -849,9 +849,24 @@ _0238ACF8: .word ov28_0238AD80
arm_func_end ov28_0238ABD4
; 0x0238ACFC
.byte 0x0D, 0x00, 0x00, 0x00, 0x90, 0xA4, 0x38, 0x02, 0x8C, 0xA5, 0x38, 0x02, 0xCC, 0xA5, 0x38, 0x02
.global ov28_0238ACFC
ov28_0238ACFC:
.byte 0x0D, 0x00, 0x00, 0x00
.word ov28_0238A490
.word ov28_0238A58C
.word ov28_0238A5CC
.global ov28_0238AD0C
ov28_0238AD0C:
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0xBF, 0x44, 0x00, 0x00, 0xC0, 0x44, 0x00, 0x00
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00
.global ov28_0238AD24
ov28_0238AD24:
.byte 0xBF, 0x44, 0x00, 0x00
.global ov28_0238AD28
ov28_0238AD28:
.byte 0xC0, 0x44, 0x00, 0x00
.global ov28_0238AD2C
ov28_0238AD2C:
.byte 0x75, 0x45, 0x00, 0x00, 0x29, 0x46, 0x00, 0x00, 0x2A, 0x46, 0x00, 0x00, 0x84, 0x46, 0x00, 0x00
.byte 0x99, 0x47, 0x00, 0x00, 0x9A, 0x47, 0x00, 0x00, 0x13, 0x48, 0x00, 0x00, 0x3D, 0x47, 0x00, 0x00
.byte 0x3E, 0x47, 0x00, 0x00, 0x98, 0x47, 0x00, 0x00, 0x85, 0x46, 0x00, 0x00, 0x86, 0x46, 0x00, 0x00

696
asm/overlay_29_022DC240.s
View File

File diff suppressed because it is too large Load Diff

4
asm/overlay_29_022E0378.s
View File

@@ -10,7 +10,7 @@ ov29_022E0378: ; 0x022E0378
cmp r1, #0
movne r0, #1
bxne lr
ldr r1, _022E03AC ; =0x020A1AE8
ldr r1, _022E03AC ; =SECONDARY_TERRAIN_TYPES
ldrb r0, [r1, r0]
cmp r0, #2
moveq r0, #1
@@ -19,7 +19,7 @@ ov29_022E0378: ; 0x022E0378
bx lr
.align 2, 0
_022E03A8: .word 0x0237CFC0
_022E03AC: .word 0x020A1AE8
_022E03AC: .word SECONDARY_TERRAIN_TYPES
arm_func_end ov29_022E0378
arm_func_start GetFloorType

160
asm/overlay_29_022E1A40.s
View File

@@ -71,7 +71,7 @@ ov29_022E1AD4: ; 0x022E1AD4
arm_func_start ov29_022E1AF4
ov29_022E1AF4: ; 0x022E1AF4
ldr r2, _022E1B24 ; =0x0237C754
ldr r2, _022E1B24 ; =ov29_0237C754
mov r3, #0
add ip, r2, r0
mov r2, #1
@@ -86,7 +86,7 @@ _022E1B18:
blo _022E1B08
bx lr
.align 2, 0
_022E1B24: .word 0x0237C754
_022E1B24: .word ov29_0237C754
arm_func_end ov29_022E1AF4
arm_func_start ov29_022E1B28
@@ -96,7 +96,7 @@ ov29_022E1B28: ; 0x022E1B28
mov r8, r0
mov r5, r4
_022E1B38:
ldr r0, _022E1C04 ; =0x02353538
ldr r0, _022E1C04 ; =ov29_02353538
ldr r0, [r0]
add r0, r0, r5, lsl #2
add r0, r0, #0x12000
@@ -121,7 +121,7 @@ _022E1B38:
mov r2, #0
strb r6, [r0, #0x17b]
mov r1, #1
ldr r0, _022E1C08 ; =0x0237C754
ldr r0, _022E1C08 ; =ov29_0237C754
b _022E1BB4
_022E1BA4:
cmp r4, #0x48
@@ -143,7 +143,7 @@ _022E1BD8:
cmp r5, #4
blt _022E1B38
mov r1, #0
ldr r0, _022E1C08 ; =0x0237C754
ldr r0, _022E1C08 ; =ov29_0237C754
b _022E1BF8
_022E1BF0:
strb r1, [r0, r4]
@@ -153,8 +153,8 @@ _022E1BF8:
blt _022E1BF0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E1C04: .word 0x02353538
_022E1C08: .word 0x0237C754
_022E1C04: .word ov29_02353538
_022E1C08: .word ov29_0237C754
arm_func_end ov29_022E1B28
arm_func_start ov29_022E1C0C
@@ -168,8 +168,8 @@ ov29_022E1C0C: ; 0x022E1C0C
ldr r4, [r7, #0xb4]
ldrb r0, [r4, #6]
cmp r0, #0
ldrne r5, _022E1C7C ; =0x0237C79C
ldreq r5, _022E1C80 ; =0x0237C754
ldrne r5, _022E1C7C ; =ov29_0237C79C
ldreq r5, _022E1C80 ; =ov29_0237C754
cmp r6, #0
beq _022E1C48
ldrb r0, [r7, #0xaa]
@@ -191,8 +191,8 @@ _022E1C6C:
blt _022E1C54
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022E1C7C: .word 0x0237C79C
_022E1C80: .word 0x0237C754
_022E1C7C: .word ov29_0237C79C
_022E1C80: .word ov29_0237C754
arm_func_end ov29_022E1C0C
arm_func_start ov29_022E1C84
@@ -214,7 +214,7 @@ ov29_022E1C84: ; 0x022E1C84
mov r3, #0
rsb ip, r5, #0x48
mov r2, r3
ldr r1, _022E1D28 ; =0x0237C754
ldr r1, _022E1D28 ; =ov29_0237C754
b _022E1D04
_022E1CD0:
mov r8, r2
@@ -245,7 +245,7 @@ _022E1D0C:
movne r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E1D28: .word 0x0237C754
_022E1D28: .word ov29_0237C754
arm_func_end ov29_022E1C84
arm_func_start ov29_022E1D2C
@@ -273,7 +273,7 @@ ov29_022E1D2C: ; 0x022E1D2C
moveq r0, #0
beq _022E1EB8
mov r5, #0
ldr sb, _022E1EC0 ; =0x02353538
ldr sb, _022E1EC0 ; =ov29_02353538
b _022E1EAC
_022E1D90:
ldr r0, [sb]
@@ -286,7 +286,7 @@ _022E1D90:
bne _022E1EA8
mov r0, #1
str r0, [r7]
ldr r0, _022E1EC0 ; =0x02353538
ldr r0, _022E1EC0 ; =ov29_02353538
strb r5, [r7, #0x24]
ldr r0, [r0]
add r1, r5, r5, lsl #3
@@ -337,7 +337,7 @@ _022E1D90:
mov r0, r0, lsr #0x10
mov r1, r1, lsr #0x10
bl ov29_022E1AF4
ldr r1, _022E1EC0 ; =0x02353538
ldr r1, _022E1EC0 ; =ov29_02353538
mov r0, r7
ldr r1, [r1]
add r1, r1, #0x700
@@ -356,12 +356,12 @@ _022E1EB8:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_022E1EC0: .word 0x02353538
_022E1EC0: .word ov29_02353538
arm_func_end ov29_022E1D2C
arm_func_start ov29_022E1EC4
ov29_022E1EC4: ; 0x022E1EC4
ldr r2, _022E1EF4 ; =0x0237C79C
ldr r2, _022E1EF4 ; =ov29_0237C79C
mov r3, #0
add ip, r2, r0
mov r2, #1
@@ -376,13 +376,13 @@ _022E1EE8:
blo _022E1ED8
bx lr
.align 2, 0
_022E1EF4: .word 0x0237C79C
_022E1EF4: .word ov29_0237C79C
arm_func_end ov29_022E1EC4
arm_func_start ov29_022E1EF8
ov29_022E1EF8: ; 0x022E1EF8
mov r0, #0
ldr r2, _022E1F30 ; =0x0237C79C
ldr r2, _022E1F30 ; =ov29_0237C79C
mov r3, r0
_022E1F04:
ldrb r1, [r2, r3]
@@ -397,7 +397,7 @@ _022E1F04:
blo _022E1F04
bx lr
.align 2, 0
_022E1F30: .word 0x0237C79C
_022E1F30: .word ov29_0237C79C
arm_func_end ov29_022E1EF8
arm_func_start ov29_022E1F34
@@ -407,7 +407,7 @@ ov29_022E1F34: ; 0x022E1F34
mov r8, r0
mov r5, r4
_022E1F44:
ldr r0, _022E2010 ; =0x02353538
ldr r0, _022E2010 ; =ov29_02353538
ldr r0, [r0]
add r0, r0, r5, lsl #2
add r0, r0, #0x12000
@@ -432,7 +432,7 @@ _022E1F44:
mov r2, #0
strb r6, [r0, #0x17b]
mov r1, #1
ldr r0, _022E2014 ; =0x0237C79C
ldr r0, _022E2014 ; =ov29_0237C79C
b _022E1FC0
_022E1FB0:
cmp r4, #0xae
@@ -454,7 +454,7 @@ _022E1FE4:
cmp r5, #0x10
blt _022E1F44
mov r1, #0
ldr r0, _022E2014 ; =0x0237C79C
ldr r0, _022E2014 ; =ov29_0237C79C
b _022E2004
_022E1FFC:
strb r1, [r0, r4]
@@ -464,8 +464,8 @@ _022E2004:
blt _022E1FFC
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E2010: .word 0x02353538
_022E2014: .word 0x0237C79C
_022E2010: .word ov29_02353538
_022E2014: .word ov29_0237C79C
arm_func_end ov29_022E1F34
arm_func_start ov29_022E2018
@@ -487,7 +487,7 @@ ov29_022E2018: ; 0x022E2018
mov r3, #0
rsb ip, r5, #0xae
mov r2, r3
ldr r1, _022E20BC ; =0x0237C79C
ldr r1, _022E20BC ; =ov29_0237C79C
b _022E2098
_022E2064:
mov r8, r2
@@ -518,7 +518,7 @@ _022E20A0:
movne r0, #1
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E20BC: .word 0x0237C79C
_022E20BC: .word ov29_0237C79C
arm_func_end ov29_022E2018
arm_func_start CreateEnemyEntity
@@ -544,7 +544,7 @@ CreateEnemyEntity: ; 0x022E20C0
moveq r0, #0
beq _022E2254
mov r5, #0
ldr sb, _022E225C ; =0x02353538
ldr sb, _022E225C ; =ov29_02353538
b _022E2248
_022E211C:
ldr r0, [sb]
@@ -559,7 +559,7 @@ _022E211C:
str r0, [r7]
strb r5, [r7, #0x24]
mov r0, #0
ldr r1, _022E225C ; =0x02353538
ldr r1, _022E225C ; =ov29_02353538
strb r0, [r7, #0x22]
ldr r1, [r1]
add r2, r5, r5, lsl #3
@@ -612,7 +612,7 @@ _022E211C:
mov r1, r1, lsr #0x10
bl ov29_022E1EC4
bl ov29_022E2978
ldr r1, _022E225C ; =0x02353538
ldr r1, _022E225C ; =ov29_02353538
mov r0, r7
ldr r1, [r1]
add r1, r1, #0x700
@@ -631,7 +631,7 @@ _022E2254:
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_022E225C: .word 0x02353538
_022E225C: .word ov29_02353538
arm_func_end CreateEnemyEntity
arm_func_start SpawnTrap
@@ -642,7 +642,7 @@ SpawnTrap: ; 0x022E2260
mov r8, r2
mov r7, r3
mov r5, #0
ldr r4, _022E2310 ; =0x02353538
ldr r4, _022E2310 ; =ov29_02353538
b _022E2300
_022E2280:
ldr r0, [r4]
@@ -654,7 +654,7 @@ _022E2280:
cmp r0, #0
bne _022E22FC
mov r1, #2
ldr r0, _022E2310 ; =0x02353538
ldr r0, _022E2310 ; =ov29_02353538
str r1, [r6]
ldr r0, [r0]
mov r2, #0
@@ -684,14 +684,14 @@ _022E2300:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
.align 2, 0
_022E2310: .word 0x02353538
_022E2310: .word ov29_02353538
arm_func_end SpawnTrap
arm_func_start SpawnItemEntity
SpawnItemEntity: ; 0x022E2314
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r1, _022E2410 ; =0x02353538
ldr r2, _022E2414 ; =0x020A1AE8
ldr r1, _022E2410 ; =ov29_02353538
ldr r2, _022E2414 ; =SECONDARY_TERRAIN_TYPES
ldr r1, [r1]
mov r6, r0
add r0, r1, #0x4000
@@ -709,7 +709,7 @@ SpawnItemEntity: ; 0x022E2314
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
_022E235C:
mov r4, #0
ldr r7, _022E2410 ; =0x02353538
ldr r7, _022E2410 ; =ov29_02353538
b _022E2400
_022E2368:
ldr r0, [r7]
@@ -720,7 +720,7 @@ _022E2368:
bl EntityIsValid__022E1A1C
cmp r0, #0
bne _022E23FC
ldr r0, _022E2410 ; =0x02353538
ldr r0, _022E2410 ; =ov29_02353538
mov r1, #3
str r1, [r5]
ldr r1, [r0]
@@ -757,8 +757,8 @@ _022E2400:
mov r0, #0
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022E2410: .word 0x02353538
_022E2414: .word 0x020A1AE8
_022E2410: .word ov29_02353538
_022E2414: .word SECONDARY_TERRAIN_TYPES
arm_func_end SpawnItemEntity
arm_func_start ov29_022E2418
@@ -769,7 +769,7 @@ ov29_022E2418: ; 0x022E2418
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
ldr r0, _022E246C ; =0x02353538
ldr r0, _022E246C ; =ov29_02353538
mov r1, #5
ldr r0, [r0]
mov r2, #0
@@ -785,7 +785,7 @@ ov29_022E2418: ; 0x022E2418
strh r2, [r0, #0x26]
ldmia sp!, {r4, pc}
.align 2, 0
_022E246C: .word 0x02353538
_022E246C: .word ov29_02353538
arm_func_end ov29_022E2418
arm_func_start ov29_022E2470
@@ -819,7 +819,7 @@ _022E24C0:
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r3, r4, r5, pc}
ldr r0, _022E2570 ; =0x02353538
ldr r0, _022E2570 ; =ov29_02353538
ldr r2, [r5, #0xb4]
ldr r0, [r0]
ldrb r1, [r2, #6]
@@ -863,7 +863,7 @@ _022E2568:
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_022E2570: .word 0x02353538
_022E2570: .word ov29_02353538
arm_func_end ShouldMinimapDisplayEntity
arm_func_start ShouldDisplayEntity
@@ -879,7 +879,7 @@ ShouldDisplayEntity: ; 0x022E2574
moveq r6, #0x20
cmp lr, #2
bne _022E25D8
ldr r2, _022E2724 ; =0x02353538
ldr r2, _022E2724 ; =ov29_02353538
ldr r3, _022E2728 ; =0x0001A224
ldr r4, [r2]
add r8, r3, #2
@@ -894,7 +894,7 @@ ShouldDisplayEntity: ; 0x022E2574
sub r7, r7, r8
b _022E2600
_022E25D8:
ldr r3, _022E2724 ; =0x02353538
ldr r3, _022E2724 ; =ov29_02353538
ldr r2, _022E2728 ; =0x0001A224
ldr r4, [r3]
add r3, r2, #2
@@ -987,7 +987,7 @@ _022E271C:
mov r0, #0
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E2724: .word 0x02353538
_022E2724: .word ov29_02353538
_022E2728: .word 0x0001A224
arm_func_end ShouldDisplayEntity
@@ -1176,7 +1176,7 @@ CanTargetPosition: ; 0x022E2954
ov29_022E2978: ; 0x022E2978
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r5, #0
ldr r6, _022E2A34 ; =0x02353538
ldr r6, _022E2A34 ; =ov29_02353538
mov r4, r5
_022E2988:
ldr r0, [r6]
@@ -1194,7 +1194,7 @@ _022E2988:
addne r5, r5, #1
cmp r4, #4
blt _022E2988
ldr r6, _022E2A34 ; =0x02353538
ldr r6, _022E2A34 ; =ov29_02353538
mov r4, #0
_022E29CC:
ldr r0, [r6]
@@ -1213,7 +1213,7 @@ _022E29CC:
cmp r4, #0x10
blt _022E29CC
mov r2, #0
ldr r1, _022E2A34 ; =0x02353538
ldr r1, _022E2A34 ; =ov29_02353538
b _022E2A28
_022E2A14:
ldr r0, [r1]
@@ -1226,12 +1226,12 @@ _022E2A28:
blt _022E2A14
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022E2A34: .word 0x02353538
_022E2A34: .word ov29_02353538
arm_func_end ov29_022E2978
arm_func_start GetTeamMemberIndex
GetTeamMemberIndex: ; 0x022E2A38
ldr r1, _022E2A74 ; =0x02353538
ldr r1, _022E2A74 ; =ov29_02353538
mov r2, #0
ldr r3, [r1]
b _022E2A64
@@ -1249,7 +1249,7 @@ _022E2A64:
mvn r0, #0
bx lr
.align 2, 0
_022E2A74: .word 0x02353538
_022E2A74: .word ov29_02353538
arm_func_end GetTeamMemberIndex
arm_func_start ov29_022E2A78
@@ -1332,7 +1332,7 @@ _022E2B64: .word 0x00000A42
arm_func_start ov29_022E2B68
ov29_022E2B68: ; 0x022E2B68
stmdb sp!, {r3, r4, r5, lr}
ldr r1, _022E2C5C ; =0x02353538
ldr r1, _022E2C5C ; =ov29_02353538
movs r5, r0
ldr r2, [r1]
mov r1, #0
@@ -1380,11 +1380,11 @@ _022E2BF4:
strb r0, [r4, #0x2e]
bl ov29_022E2C6C
ldr r1, _022E2C64 ; =0x0000FFFF
ldr r0, _022E2C68 ; =0x0237C84C
ldr r0, _022E2C68 ; =ov29_0237C84C
cmp r5, #0
str r1, [r0]
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, _022E2C5C ; =0x02353538
ldr r0, _022E2C5C ; =ov29_02353538
ldr r0, [r0]
add r0, r0, #0x28000
ldrb r0, [r0, #0x6c8]
@@ -1394,15 +1394,15 @@ _022E2BF4:
streqb r0, [r4, #0x24]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_022E2C5C: .word 0x02353538
_022E2C5C: .word ov29_02353538
_022E2C60: .word 0x0001A21C
_022E2C64: .word 0x0000FFFF
_022E2C68: .word 0x0237C84C
_022E2C68: .word ov29_0237C84C
arm_func_end ov29_022E2B68
arm_func_start ov29_022E2C6C
ov29_022E2C6C: ; 0x022E2C6C
ldr r0, _022E2C9C ; =0x02353538
ldr r0, _022E2C9C ; =ov29_02353538
mvn r1, #0
ldr r0, [r0]
add r0, r0, #0x21c
@@ -1415,13 +1415,13 @@ ov29_022E2C6C: ; 0x022E2C6C
strh r1, [r0, #0x3a]
bx lr
.align 2, 0
_022E2C9C: .word 0x02353538
_022E2C9C: .word ov29_02353538
arm_func_end ov29_022E2C6C
arm_func_start ov29_022E2CA0
ov29_022E2CA0: ; 0x022E2CA0
stmdb sp!, {r4, r5, r6, lr}
ldr r1, _022E2D34 ; =0x02353538
ldr r1, _022E2D34 ; =ov29_02353538
mov r4, r0
ldr r3, [r1]
ldr r0, _022E2D38 ; =0x0001A21C
@@ -1459,14 +1459,14 @@ _022E2D2C:
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022E2D34: .word 0x02353538
_022E2D34: .word ov29_02353538
_022E2D38: .word 0x0001A21C
arm_func_end ov29_022E2CA0
arm_func_start ov29_022E2D3C
ov29_022E2D3C: ; 0x022E2D3C
stmdb sp!, {r4, r5, r6, lr}
ldr r1, _022E2DD0 ; =0x02353538
ldr r1, _022E2DD0 ; =ov29_02353538
mov r4, r0
ldr r3, [r1]
ldr r0, _022E2DD4 ; =0x0001A21C
@@ -1504,7 +1504,7 @@ _022E2DC8:
mov r0, #0
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022E2DD0: .word 0x02353538
_022E2DD0: .word ov29_02353538
_022E2DD4: .word 0x0001A21C
arm_func_end ov29_022E2D3C
@@ -1513,19 +1513,19 @@ UpdateMapSurveyorFlag: ; 0x022E2DD8
stmdb sp!, {r3, lr}
mov r0, #0x41
bl TeamMemberHasEnabledIqSkill
ldr r1, _022E2DF8 ; =0x02353538
ldr r1, _022E2DF8 ; =ov29_02353538
ldr r1, [r1]
add r1, r1, #0x1a000
strb r0, [r1, #0x241]
ldmia sp!, {r3, pc}
.align 2, 0
_022E2DF8: .word 0x02353538
_022E2DF8: .word ov29_02353538
arm_func_end UpdateMapSurveyorFlag
arm_func_start ov29_022E2DFC
ov29_022E2DFC: ; 0x022E2DFC
stmdb sp!, {r3, lr}
ldr r1, _022E2E50 ; =0x02353538
ldr r1, _022E2E50 ; =ov29_02353538
cmp r0, #0
ldr r1, [r1]
add r1, r1, #0x21c
@@ -1547,13 +1547,13 @@ _022E2E40:
bl ov29_022E2C6C
ldmia sp!, {r3, pc}
.align 2, 0
_022E2E50: .word 0x02353538
_022E2E50: .word ov29_02353538
arm_func_end ov29_022E2DFC
arm_func_start PointCameraToMonster
PointCameraToMonster: ; 0x022E2E54
stmdb sp!, {r4, lr}
ldr r2, _022E2EC0 ; =0x02353538
ldr r2, _022E2EC0 ; =ov29_02353538
mov r4, r1
ldr r1, [r2]
cmp r0, #0
@@ -1581,14 +1581,14 @@ _022E2E98:
bl UpdateMinimap
ldmia sp!, {r4, pc}
.align 2, 0
_022E2EC0: .word 0x02353538
_022E2EC0: .word ov29_02353538
arm_func_end PointCameraToMonster
arm_func_start UpdateCamera
UpdateCamera: ; 0x022E2EC4
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #0x10
ldr r1, _022E32DC ; =0x02353538
ldr r1, _022E32DC ; =ov29_02353538
str r0, [sp]
ldr r0, [r1]
cmp r0, #0
@@ -1684,7 +1684,7 @@ UpdateCamera: ; 0x022E2EC4
movne r2, #0xe
strneb r0, [r4, #0x22]
moveq r2, #0
ldr r0, _022E32E0 ; =0x0237C84C
ldr r0, _022E32E0 ; =ov29_0237C84C
streqb r2, [r4, #0x22]
ldr r1, [r0]
cmp r1, r2
@@ -1707,7 +1707,7 @@ _022E3088:
b _022E30A8
_022E309C:
ldr r1, _022E32E4 ; =0x0000FFFF
ldr r0, _022E32E0 ; =0x0237C84C
ldr r0, _022E32E0 ; =ov29_0237C84C
str r1, [r0]
_022E30A8:
ldrb r0, [r4, #0x22]
@@ -1721,14 +1721,14 @@ _022E30A8:
strb r0, [r4, #0x29]
ldrb r0, [r4, #0x29]
cmp r1, r0
ldreq r0, _022E32DC ; =0x02353538
ldreq r0, _022E32DC ; =ov29_02353538
ldreq r0, [r0]
addeq r0, r0, #0x2c000
ldreqb r0, [r0, #0xb10]
cmpeq r0, #0
beq _022E3108
bl ov29_023047DC
ldr r0, _022E32DC ; =0x02353538
ldr r0, _022E32DC ; =ov29_02353538
mov r1, #0
ldr r0, [r0]
mov r7, #1
@@ -1823,7 +1823,7 @@ _022E3228:
ldreqsh r0, [r4, #6]
cmpeq r1, r0
beq _022E3288
ldr r4, _022E32DC ; =0x02353538
ldr r4, _022E32DC ; =ov29_02353538
mov r5, #0
_022E3250:
ldr r0, [r4]
@@ -1844,7 +1844,7 @@ _022E327C:
_022E3288:
cmp r6, #0
beq _022E32D0
ldr r4, _022E32DC ; =0x02353538
ldr r4, _022E32DC ; =ov29_02353538
mov r5, #0
_022E3298:
ldr r0, [r4]
@@ -1868,7 +1868,7 @@ _022E32D4:
add sp, sp, #0x10
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_022E32DC: .word 0x02353538
_022E32E0: .word 0x0237C84C
_022E32DC: .word ov29_02353538
_022E32E0: .word ov29_0237C84C
_022E32E4: .word 0x0000FFFF
arm_func_end UpdateCamera

42
asm/overlay_29_022E330C.s
View File

@@ -21,7 +21,7 @@ ItemIsActive__022E330C: ; 0x022E330C
arm_func_start GetVisibilityRange
GetVisibilityRange: ; 0x022E333C
ldr r0, _022E3358 ; =0x02353538
ldr r0, _022E3358 ; =ov29_02353538
ldr r0, [r0]
add r0, r0, #0x1a000
ldrb r0, [r0, #0x23d]
@@ -29,13 +29,13 @@ GetVisibilityRange: ; 0x022E333C
moveq r0, #2
bx lr
.align 2, 0
_022E3358: .word 0x02353538
_022E3358: .word ov29_02353538
arm_func_end GetVisibilityRange
arm_func_start ov29_022E335C
ov29_022E335C: ; 0x022E335C
stmdb sp!, {r3, r4, r5, lr}
ldr r0, _022E3428 ; =0x02353538
ldr r0, _022E3428 ; =ov29_02353538
mov r5, #0
ldr r0, [r0]
add r0, r0, #0x1a000
@@ -57,14 +57,14 @@ _022E33A0:
bl ov29_022E2C6C
ldmia sp!, {r3, r4, r5, pc}
_022E33B0:
ldr r0, _022E3428 ; =0x02353538
ldr r0, _022E3428 ; =ov29_02353538
ldr r0, [r0]
add r0, r0, #0x21c
add r4, r0, #0x1a000
ldr r0, [r4, #0x10]
ldr r5, [r0, #0xb4]
bl DisplayUi
ldr r1, _022E3428 ; =0x02353538
ldr r1, _022E3428 ; =ov29_02353538
ldr r0, _022E342C ; =0x000003E7
ldr r1, [r1]
ldrb r2, [r1, #0x749]
@@ -88,14 +88,14 @@ _022E33B0:
strh r0, [r4, #0x44]
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_022E3428: .word 0x02353538
_022E3428: .word ov29_02353538
_022E342C: .word 0x000003E7
arm_func_end ov29_022E335C
arm_func_start ov29_022E3430
ov29_022E3430: ; 0x022E3430
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r1, _022E34A8 ; =0x02353538
ldr r1, _022E34A8 ; =ov29_02353538
mov r7, #0
ldr r1, [r1]
mov r4, r0
@@ -127,35 +127,35 @@ _022E3458:
bl LogMessageByIdWithPopupCheckUser
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_022E34A8: .word 0x02353538
_022E34A8: .word ov29_02353538
_022E34AC: .word 0x00000B77
arm_func_end ov29_022E3430
arm_func_start ov29_022E34B0
ov29_022E34B0: ; 0x022E34B0
ldr r1, _022E34C4 ; =0x02353538
ldr r1, _022E34C4 ; =ov29_02353538
ldr r1, [r1]
add r1, r1, #0x1a000
strb r0, [r1, #0x24c]
bx lr
.align 2, 0
_022E34C4: .word 0x02353538
_022E34C4: .word ov29_02353538
arm_func_end ov29_022E34B0
arm_func_start ov29_022E34C8
ov29_022E34C8: ; 0x022E34C8
ldr r0, _022E352C ; =0x02353538
ldr r0, _022E352C ; =ov29_02353538
ldr r3, [r0]
add r0, r3, #0x1a000
ldr r2, [r0, #0x234]
cmp r2, #0
bxeq lr
ldr r1, _022E3530 ; =0x0235110C
ldr r1, _022E3530 ; =ov29_0235110C
cmp r2, #0x1f
movge r2, #0x1f
ldr r2, [r1, r2, lsl #2]
add r0, r3, #0x1a000
ldr r1, _022E352C ; =0x02353538
ldr r1, _022E352C ; =ov29_02353538
str r2, [r0, #0x230]
ldr r0, [r1]
add r0, r0, #0x1a000
@@ -170,8 +170,8 @@ ov29_022E34C8: ; 0x022E34C8
streq r1, [r0, #0x234]
bx lr
.align 2, 0
_022E352C: .word 0x02353538
_022E3530: .word 0x0235110C
_022E352C: .word ov29_02353538
_022E3530: .word ov29_0235110C
arm_func_end ov29_022E34C8
arm_func_start ov29_022E3534
@@ -192,20 +192,20 @@ _022E3558:
arm_func_start ov29_022E3560
ov29_022E3560: ; 0x022E3560
ldr r1, _022E356C ; =0x0235354C
ldr r1, _022E356C ; =ov29_0235354C
strb r0, [r1]
bx lr
.align 2, 0
_022E356C: .word 0x0235354C
_022E356C: .word ov29_0235354C
arm_func_end ov29_022E3560
arm_func_start ov29_022E3570
ov29_022E3570: ; 0x022E3570
ldr r0, _022E357C ; =0x0235354C
ldr r0, _022E357C ; =ov29_0235354C
ldrb r0, [r0]
bx lr
.align 2, 0
_022E357C: .word 0x0235354C
_022E357C: .word ov29_0235354C
arm_func_end ov29_022E3570
arm_func_start ov29_022E3580
@@ -295,7 +295,7 @@ _022E365C:
add r7, r3, r7, lsl #8
sub r8, r2, r0
_022E36A8:
ldr r0, _022E37B0 ; =0x02353538
ldr r0, _022E37B0 ; =ov29_02353538
ldr r2, _022E37B4 ; =0x0001A226
ldr r3, [r0]
add r0, sp, #4
@@ -372,6 +372,6 @@ _022E37A8:
add sp, sp, #0x30
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022E37B0: .word 0x02353538
_022E37B0: .word ov29_02353538
_022E37B4: .word 0x0001A226
arm_func_end PlayEffectAnimationEntity

668
asm/overlay_29_022E37DC.s
View File

File diff suppressed because it is too large Load Diff

4
asm/overlay_29_022F7388.s
View File

@@ -3008,7 +3008,7 @@ ov29_022F9C74: ; 0x022F9C74
cmp r0, #2
bne _022F9D50
ldr r0, _022F9E88 ; =0x02353538
ldr r1, _022F9E8C ; =0x020A1AE8
ldr r1, _022F9E8C ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -3133,7 +3133,7 @@ _022F9E80:
ldmia sp!, {r3, r4, r5, r6, pc}
.align 2, 0
_022F9E88: .word 0x02353538
_022F9E8C: .word 0x020A1AE8
_022F9E8C: .word SECONDARY_TERRAIN_TYPES
_022F9E90: .word 0x00000115
_022F9E94: .word 0x02352768
_022F9E98: .word 0x00000C1A

8
asm/overlay_29_02300108.s
View File

@@ -1427,7 +1427,7 @@ _023013E4:
cmp r0, #2
bne _0230142C
ldr r0, _0230148C ; =0x02353538
ldr r1, _02301490 ; =0x020A1AE8
ldr r1, _02301490 ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -1467,7 +1467,7 @@ _0230142C:
_02301484: .word 0x0235171C
_02301488: .word 0x0235171E
_0230148C: .word 0x02353538
_02301490: .word 0x020A1AE8
_02301490: .word SECONDARY_TERRAIN_TYPES
_02301494: .word 0x02352770
arm_func_end CanAiMonsterMoveInDirection
@@ -1500,7 +1500,7 @@ ov29_02301498: ; 0x02301498
ldmia sp!, {r3, r4, r5, pc}
_023014FC:
ldr r0, _0230158C ; =0x02353538
ldr r1, _02301590 ; =0x020A1AE8
ldr r1, _02301590 ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -1538,7 +1538,7 @@ _02301534:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0230158C: .word 0x02353538
_02301590: .word 0x020A1AE8
_02301590: .word SECONDARY_TERRAIN_TYPES
arm_func_end ov29_02301498
arm_func_start ov29_02301594

4
asm/overlay_29_023047DC.s
View File

@@ -337,7 +337,7 @@ _02304BF8:
cmp r6, #2
bne _02304C24
ldr r0, _02304C34 ; =0x02353538
ldr r1, _02304C38 ; =0x020A1AE8
ldr r1, _02304C38 ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -352,7 +352,7 @@ _02304C24:
.align 2, 0
_02304C30: .word 0x02352808
_02304C34: .word 0x02353538
_02304C38: .word 0x020A1AE8
_02304C38: .word SECONDARY_TERRAIN_TYPES
arm_func_end ov29_02304BAC
arm_func_start ov29_02304C3C

8
asm/overlay_29_023118D8.s
View File

@@ -840,7 +840,7 @@ _02312424:
cmp r0, #2
bne _0231247C
ldr r0, _023125F8 ; =0x02353538
ldr r1, _023125FC ; =0x020A1AE8
ldr r1, _023125FC ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -961,7 +961,7 @@ _023125E8:
_023125F0: .word 0x00000DAB
_023125F4: .word 0x00000DAC
_023125F8: .word 0x02353538
_023125FC: .word 0x020A1AE8
_023125FC: .word SECONDARY_TERRAIN_TYPES
_02312600: .word 0x00000DB9
_02312604: .word 0x022C4874
_02312608: .word 0x00000D1C
@@ -1463,7 +1463,7 @@ _02312CF4:
cmp r0, #2
bne _02312D48
ldr r0, _02312E08 ; =0x02353538
ldr r1, _02312E0C ; =0x020A1AE8
ldr r1, _02312E0C ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -1529,7 +1529,7 @@ _02312D88:
_02312E00: .word 0x00000DA8
_02312E04: .word 0x00000DA9
_02312E08: .word 0x02353538
_02312E0C: .word 0x020A1AE8
_02312E0C: .word SECONDARY_TERRAIN_TYPES
_02312E10: .word 0x00000DAA
_02312E14: .word 0x022C4870
_02312E18: .word 0x00000D22

4
asm/overlay_29_023350FC.s
View File

@@ -1489,7 +1489,7 @@ ov29_02336460: ; 0x02336460
mov r0, #3
strb r0, [r1, #3]
ldr r0, _02336598 ; =0x02353538
ldr r2, _023365B4 ; =0x020A1AE8
ldr r2, _023365B4 ; =SECONDARY_TERRAIN_TYPES
ldr ip, [r0]
add r0, ip, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -1520,7 +1520,7 @@ _023365A4: .word 0x02353724
_023365A8: .word 0x00012162
_023365AC: .word 0x0237CAA0
_023365B0: .word 0x0237C9B8
_023365B4: .word 0x020A1AE8
_023365B4: .word SECONDARY_TERRAIN_TYPES
arm_func_end ov29_02336460
arm_func_start ov29_023365B8

8
asm/overlay_29_02337CCC.s
View File

@@ -124,7 +124,7 @@ _02337E54:
cmp r0, #2
bne _02337E80
ldr r0, _02337E8C ; =0x02353538
ldr r1, _02337E90 ; =0x020A1AE8
ldr r1, _02337E90 ; =SECONDARY_TERRAIN_TYPES
ldr r0, [r0]
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
@@ -138,7 +138,7 @@ _02337E84:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_02337E8C: .word 0x02353538
_02337E90: .word 0x020A1AE8
_02337E90: .word SECONDARY_TERRAIN_TYPES
arm_func_end ov29_02337E2C
arm_func_start IsWaterTileset
@@ -3322,7 +3322,7 @@ GenerateFloor: ; 0x0233A6D8
str r0, [r2, #0x2c]
add r0, r1, #0x4000
ldrsh r1, [r0, #0xd4]
ldr r0, _0233AE70 ; =0x020A1AE8
ldr r0, _0233AE70 ; =SECONDARY_TERRAIN_TYPES
ldrb r0, [r0, r1]
mov r1, #0xff
cmp r0, #2
@@ -3812,7 +3812,7 @@ _0233AE58:
_0233AE64: .word 0x02353538
_0233AE68: .word 0x000286B2
_0233AE6C: .word 0x0237CFBC
_0233AE70: .word 0x020A1AE8
_0233AE70: .word SECONDARY_TERRAIN_TYPES
_0233AE74: .word 0x00012AFA
arm_func_end GenerateFloor

4
asm/overlay_29_023456BC.s
View File

@@ -490,7 +490,7 @@ ov29_02345D84: ; 0x02345D84
ldr r0, _02346048 ; =0x02353538
mov r4, #0
ldr r0, [r0]
ldr r1, _0234604C ; =0x020A1AE8
ldr r1, _0234604C ; =SECONDARY_TERRAIN_TYPES
add r0, r0, #0x4000
ldrsh r0, [r0, #0xd4]
mov r7, r4
@@ -669,7 +669,7 @@ _02346040:
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_02346048: .word 0x02353538
_0234604C: .word 0x020A1AE8
_0234604C: .word SECONDARY_TERRAIN_TYPES
_02346050: .word 0x023518AC
_02346054: .word 0x023531BC
_02346058: .word 0x00000B74

2254
asm/overlay_29_0234EC38.s
View File

File diff suppressed because it is too large Load Diff

4
asm/overlay_31.s
View File

@@ -1164,7 +1164,7 @@ ov31_02383768: ; 0x02383768
mvn r1, #1
cmp r0, r1
ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
bl ov00_022BCD10
bl ov10_022BCD10
cmp r0, #0
beq _023837B4
mvn r4, #3
@@ -1180,7 +1180,7 @@ _02383798:
bne _02383798
_023837B4:
ldrsb r0, [r7]
bl ov00_022BCCF4
bl ov10_022BCCF4
mvn r0, #1
strb r0, [r7]
ldmia sp!, {r3, r4, r5, r6, r7, pc}