Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synced from pmdsky-debug

Browse Source
This commit is contained in:
AnonymousRandomPerson 2026-03-17 21:59:30 -04:00
parent a174a88286
commit f7b26789db
29 changed files with 259 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/main_0204EFE0.inc
View File

@ -12,6 +12,7 @@
.public ADVENTURE_LOG_PTR
.public ARM9_UNKNOWN_DATA__NA_209E6BC
.public Copy16BitsFrom
.public Copy16BitsTo
.public CopyNStringFromId
.public DUNGEON_DATA_LIST
.public DungeonSwapIdToIdx
@ -52,7 +53,6 @@
.public StrncpySimpleNoPad
.public StrncpySimpleNoPadSafe
.public sub_0204CEE0
.public Copy16BitsTo
.public sub_0205EE40
.public TEAM_MEMBER_TABLE_PTR
.public TEAM_NAME

2
asm/include/main_02059224.inc
View File

@ -1,7 +1,7 @@
#pragma once
.public CopyBitsFrom
.public ReadMonsterFromSave
.public TEAM_MEMBER_TABLE_PTR
.public sub_02050974
.public sub_020509BC
.public sub_0205523C
.public TEAM_MEMBER_TABLE_PTR

6
asm/include/main_0205956C.inc
View File

@ -1,11 +1,10 @@
#pragma once
.public _020A3498
.public _020A3499
.public Copy16BitsFrom
.public Copy16BitsTo
.public CopyBitsFrom
.public CopyBitsTo
.public TEAM_MEMBER_TABLE_PTR
.public _020A3498
.public _020A3499
.public memset
.public sub_0200DF2C
.public sub_0200DF74
@ -16,3 +15,4 @@
.public sub_02051098
.public sub_020510C0
.public sub_020584F8
.public TEAM_MEMBER_TABLE_PTR

2
asm/include/main_02059B18.inc
View File

@ -1,8 +1,8 @@
#pragma once
.public _s32_div_f
.public CanEvolve
.public FindItemInInventory
.public GetEvoParameters
.public GetResolvedPerformanceProgressFlag
.public IsMonsterOnTeam
.public JoinedAtRangeCheck2
.public _s32_div_f

18
asm/include/main_0205A4B4.inc
View File

@ -1,4 +1,12 @@
#pragma once
.public _020A34B8
.public _020A34C4
.public _020A34D2
.public _020A34FC
.public _020A3514
.public _020A351C
.public _020A3524
.public _s32_div_f
.public AllocateTemp1024ByteBufferFromPool
.public CopyNStringFromId
.public DrawTextInWindow
@ -20,16 +28,8 @@
.public PreprocessString
.public PreprocessStringFromId
.public STATUS_NAME_STRING_IDS
.public StringFromId
.public _020A34B8
.public _020A34C4
.public _020A34D2
.public _020A34FC
.public _020A3514
.public _020A351C
.public _020A3524
.public _s32_div_f
.public strcpy
.public StringFromId
.public sub_0200D670
.public sub_02026268
.public sub_02026358

4
asm/include/main_0205B0B8.inc
View File

@ -1,4 +1,5 @@
#pragma once
.public _020A1870
.public AURA_BOW_STAT_BOOST
.public DEF_SCARF_STAT_BOOST
.public EnableAllLearnableIqSkills
@ -9,6 +10,5 @@
.public MUNCH_BELT_STAT_BOOST
.public POWER_BAND_STAT_BOOST
.public SPECIAL_BAND_STAT_BOOST
.public ZINC_BAND_STAT_BOOST
.public _020A1870
.public sub_02011220
.public ZINC_BAND_STAT_BOOST

332
asm/include/main_0205B39C.inc
View File

@ -1,170 +1,4 @@
#pragma once
.public ARM9_UNKNOWN_TABLE__NA_20A68BC
.public AllocateTemp1024ByteBufferFromPool
.public BulkItemToItem
.public CAFE_MISSION_REWARD_TYPE_WEIGHTS
.public CloseCollectionMenu
.public ClosePortraitBox
.public Copy16BitsFrom
.public Copy16BitsTo
.public CopyBitsFrom
.public CopyBitsTo
.public CopyFrameTypeOption
.public CopyMovesetFrom
.public CopyMovesetTo
.public CreateCollectionMenu
.public CreatePortraitBox
.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
.public DEMO_TEAMS
.public Debug_GetDebugFlag
.public Debug_Print0
.public DexNumbersEqual
.public DirectoryFileMngr_ExtractAllDirectoryFiles
.public DirectoryFileMngr_OpenDirectoryFile
.public DrawTextInWindow
.public DungeonGoesUp
.public DungeonSwapIdToIdx
.public ENTITIES
.public EVENTS
.public EnqueueRender3dTiling
.public ExplorersOfSkyMain
.public FemaleToMaleForm
.public GetAdventureLogDungeonFloor
.public GetBaseForm
.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
.public GetBodySize
.public GetDebugSpecialEpisodeNumber
.public GetDungeonMode
.public GetExclusiveItem
.public GetFirstMatchingMemberIdx
.public GetHero
.public GetHeroMemberIdx
.public GetLanguageType
.public GetMainCharacter1
.public GetMainCharacter1MemberIdx
.public GetMainCharacter2
.public GetMainCharacter2MemberIdx
.public GetMainCharacter3
.public GetMainCharacter3MemberIdx
.public GetMainTeamNameWithCheck
.public GetMaxItemsAllowed
.public GetMaxMembersAllowed
.public GetMaxReachedFloor
.public GetMaxRescueAttempts
.public GetNameString
.public GetNbFloors
.public GetPartner
.public GetPartnerMemberIdx
.public GetPartyMembers
.public GetRank
.public GetResolvedPerformanceProgressFlag
.public GetScenarioBalance
.public GetSecondFormIfValid
.public GetSpecialEpisodeType
.public GetStringFromFileVeneer
.public GetType
.public GlobalProgressAlloc
.public HandleSir0TranslationVeneer
.public HasMonsterBeenAttackedInDungeons
.public ITEM_DELIVERY_TABLE
.public InitKaomadoStream
.public InitOptionsVeneer
.public InitPreprocessorArgs
.public InitScriptVariableValues
.public InitSpecialEpisodeHero
.public InitWanTable
.public IsCollectionMenuActive
.public IsForbiddenFloor
.public IsInvalidForMission
.public IsItemAvailableInDungeonGroup
.public IsItemInBag
.public IsItemInTimeDarkness
.public IsItemInTreasureBoxes
.public IsItemValidVeneer
.public IsMonsterValid
.public IsMovesetValid
.public IsMovesetValidInTimeDarkness
.public IsSpecialEpisodeBeaten
.public IsSpecialEpisodeOpen
.public IsStorableItem
.public IsStoryBeforePoint
.public IsThrownItem
.public IsValidTargetItem
.public JOB_MENU_ITEMS_1
.public JOB_MENU_ITEMS_10
.public JOB_MENU_ITEMS_11
.public JOB_MENU_ITEMS_12
.public JOB_MENU_ITEMS_13
.public JOB_MENU_ITEMS_2
.public JOB_MENU_ITEMS_3
.public JOB_MENU_ITEMS_4
.public JOB_MENU_ITEMS_5
.public JOB_MENU_ITEMS_6
.public JOB_MENU_ITEMS_7
.public JOB_MENU_ITEMS_8
.public JOB_MENU_ITEMS_9
.public JOB_WINDOW_PARAMS_1
.public JOB_WINDOW_PARAMS_2
.public KeyWaitInit
.public LoadFileFromRom
.public LoadOverlay
.public LoadScriptVariableValue
.public LoadTblTalk
.public LoadWazaP
.public MISSION_BANNED_MONSTERS
.public MISSION_BANNED_STORY_MONSTERS
.public MISSION_DELIVER_LIST_PTR
.public MISSION_DUNGEON_UNLOCK_TABLE
.public MISSION_MENU_STRING_IDS_1
.public MISSION_MENU_STRING_IDS_2
.public MISSION_RANK_POINTS
.public MISSION_STRING_IDS
.public MISSION_VALIDATION_FUNCTION_LIST
.public MainGame
.public MemAlloc
.public MemFree
.public MemZero
.public MemcpySimple
.public MemsetSimple
.public MissionToWonderMailPassword
.public MultiplyByFixedPoint
.public NO_SEND_ITEM_TABLE
.public NoteLoadBase
.public NoteSaveBase
.public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS
.public OverlayIsLoaded
.public PlaySeVolumeWrapper
.public PreprocessString
.public PreprocessStringFromId
.public RANK_STRING_PTR_TABLE
.public REMOTE_STRING_PTR_TABLE
.public Rand16Bit
.public RandInt
.public RandIntSafe
.public RandRangeSafe
.public ReadSaveHeader
.public RemoveFirstUnequippedItemOfType
.public RetrieveFromItemList2
.public SaveScriptVariableValue
.public SetAdventureLogStructLocation
.public SetBothScreensWindowsColor
.public SetCollectionMenuField0x1B2
.public SetGameMode
.public SetQuestionMarks
.public SetScenarioProgressScriptVar
.public SetSpecialEpisodeOpen
.public SetSpecialEpisodeType
.public ShowPortraitInPortraitBox
.public StrcpyName
.public StringFromId
.public StrncpySimple
.public StrncpySimpleNoPadSafe
.public TEAM_MEMBER_TABLE_PTR
.public UnloadFile
.public UnloadOverlay
.public UpdateWindow
.public WAN_TABLE
.public ZeroInitScriptVariable
.public _020A18FC
.public _020A1904
.public _020A1958
@ -272,7 +106,140 @@
.public _022B7310
.public _022B7320
.public _s32_div_f
.public AllocateTemp1024ByteBufferFromPool
.public ARM9_UNKNOWN_TABLE__NA_20A68BC
.public BulkItemToItem
.public CAFE_MISSION_REWARD_TYPE_WEIGHTS
.public CloseCollectionMenu
.public ClosePortraitBox
.public Copy16BitsFrom
.public Copy16BitsTo
.public CopyBitsFrom
.public CopyBitsTo
.public CopyFrameTypeOption
.public CopyMovesetFrom
.public CopyMovesetTo
.public CreateCollectionMenu
.public CreatePortraitBox
.public Debug_GetDebugFlag
.public Debug_Print0
.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
.public DEMO_TEAMS
.public DexNumbersEqual
.public DirectoryFileMngr_ExtractAllDirectoryFiles
.public DirectoryFileMngr_OpenDirectoryFile
.public DrawTextInWindow
.public DungeonGoesUp
.public DungeonSwapIdToIdx
.public EnqueueRender3dTiling
.public ENTITIES
.public EVENTS
.public ExplorersOfSkyMain
.public FemaleToMaleForm
.public GetAdventureLogDungeonFloor
.public GetBaseForm
.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
.public GetBodySize
.public GetDebugSpecialEpisodeNumber
.public GetDungeonMode
.public GetExclusiveItem
.public GetFirstMatchingMemberIdx
.public GetHero
.public GetHeroMemberIdx
.public GetLanguageType
.public GetMainCharacter1
.public GetMainCharacter1MemberIdx
.public GetMainCharacter2
.public GetMainCharacter2MemberIdx
.public GetMainCharacter3
.public GetMainCharacter3MemberIdx
.public GetMainTeamNameWithCheck
.public GetMaxItemsAllowed
.public GetMaxMembersAllowed
.public GetMaxReachedFloor
.public GetMaxRescueAttempts
.public GetNameString
.public GetNbFloors
.public GetPartner
.public GetPartnerMemberIdx
.public GetPartyMembers
.public GetRank
.public GetResolvedPerformanceProgressFlag
.public GetScenarioBalance
.public GetSecondFormIfValid
.public GetSpecialEpisodeType
.public GetStringFromFileVeneer
.public GetType
.public GlobalProgressAlloc
.public HandleSir0TranslationVeneer
.public HasMonsterBeenAttackedInDungeons
.public InitKaomadoStream
.public InitOptionsVeneer
.public InitPreprocessorArgs
.public InitScriptVariableValues
.public InitSpecialEpisodeHero
.public InitWanTable
.public IsCollectionMenuActive
.public IsForbiddenFloor
.public IsInvalidForMission
.public IsItemAvailableInDungeonGroup
.public IsItemInBag
.public IsItemInTimeDarkness
.public IsItemInTreasureBoxes
.public IsItemValidVeneer
.public IsMonsterValid
.public IsMovesetValid
.public IsMovesetValidInTimeDarkness
.public IsSpecialEpisodeBeaten
.public IsSpecialEpisodeOpen
.public IsStorableItem
.public IsStoryBeforePoint
.public IsThrownItem
.public IsValidTargetItem
.public ITEM_DELIVERY_TABLE
.public JOB_MENU_ITEMS_1
.public JOB_MENU_ITEMS_10
.public JOB_MENU_ITEMS_11
.public JOB_MENU_ITEMS_12
.public JOB_MENU_ITEMS_13
.public JOB_MENU_ITEMS_2
.public JOB_MENU_ITEMS_3
.public JOB_MENU_ITEMS_4
.public JOB_MENU_ITEMS_5
.public JOB_MENU_ITEMS_6
.public JOB_MENU_ITEMS_7
.public JOB_MENU_ITEMS_8
.public JOB_MENU_ITEMS_9
.public JOB_WINDOW_PARAMS_1
.public JOB_WINDOW_PARAMS_2
.public KeyWaitInit
.public LoadFileFromRom
.public LoadOverlay
.public LoadScriptVariableValue
.public LoadTblTalk
.public LoadWazaP
.public MainGame
.public MemAlloc
.public MemcpySimple
.public MemFree
.public memset
.public MemsetSimple
.public MemZero
.public MISSION_BANNED_MONSTERS
.public MISSION_BANNED_STORY_MONSTERS
.public MISSION_DELIVER_LIST_PTR
.public MISSION_DUNGEON_UNLOCK_TABLE
.public MISSION_MENU_STRING_IDS_1
.public MISSION_MENU_STRING_IDS_2
.public MISSION_RANK_POINTS
.public MISSION_STRING_IDS
.public MISSION_VALIDATION_FUNCTION_LIST
.public MissionToWonderMailPassword
.public MultiplyByFixedPoint
.public NO_SEND_ITEM_TABLE
.public NoteLoadBase
.public NoteSaveBase
.public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS
.public ov00_022BE0C8
.public ov01_02337B3C
.public ov01_02337B68
@ -288,9 +255,36 @@
.public ov03_0233CDE4
.public ov11_022E82CC
.public ov11_022E96E4
.public OverlayIsLoaded
.public PlaySeVolumeWrapper
.public PreprocessString
.public PreprocessStringFromId
.public Rand16Bit
.public RandInt
.public RandIntSafe
.public RandRangeSafe
.public RANK_STRING_PTR_TABLE
.public ReadSaveHeader
.public REMOTE_STRING_PTR_TABLE
.public RemoveFirstUnequippedItemOfType
.public RetrieveFromItemList2
.public SaveScriptVariableValue
.public SetAdventureLogStructLocation
.public SetBothScreensWindowsColor
.public SetCollectionMenuField0x1B2
.public SetGameMode
.public SetQuestionMarks
.public SetScenarioProgressScriptVar
.public SetSpecialEpisodeOpen
.public SetSpecialEpisodeType
.public ShowPortraitInPortraitBox
.public strcat
.public strcpy
.public StrcpyName
.public StringFromId
.public strncat
.public StrncpySimple
.public StrncpySimpleNoPadSafe
.public sub_02001AB0
.public sub_020022C4
.public sub_020022D0
@ -398,4 +392,10 @@
.public sub_02056E04
.public sub_02059AE8
.public sub_02059AF8
.public TEAM_MEMBER_TABLE_PTR
.public UnloadFile
.public UnloadOverlay
.public UpdateWindow
.public vsprintf
.public WAN_TABLE
.public ZeroInitScriptVariable

2
asm/include/overlay_01.inc
View File

@ -19,6 +19,7 @@
.public CloseTextBox
.public ComputeSpecialCounters
.public Copy16BitsFrom
.public Copy16BitsTo
.public CopyBitsFrom
.public CopyBitsTo
.public CopyMovesetFrom
@ -357,7 +358,6 @@
.public sub_02050990
.public sub_020509BC
.public sub_02050CD0
.public Copy16BitsTo
.public sub_02052060
.public sub_020547C8
.public sub_020547D8

2
asm/include/overlay_05.inc
View File

@ -4,6 +4,7 @@
.public CloseAdvancedMenu
.public CreateAdvancedMenu
.public DrawTextInWindow
.public ExplorerMazeMonsterExists
.public GetAdvancedMenuCurrentOption
.public GetAdvancedMenuResult
.public GetAdventureLogDungeonFloor
@ -102,7 +103,6 @@
.public sub_02055E14
.public sub_02057010
.public sub_02057030
.public ExplorerMazeMonsterExists
.public sub_02058FCC
.public sub_020590C0
.public sub_020590DC

2
asm/include/overlay_16.inc
View File

@ -25,6 +25,7 @@
.public GetPressedButtons
.public GetSimpleMenuResult__0202B870
.public GetTeamMember
.public HandleShedinjaEvolution
.public IncrementNbEvolutions
.public InitPortraitParamsWithMonsterId
.public InitPreprocessorArgs
@ -90,6 +91,5 @@
.public sub_020572EC
.public sub_020582E0
.public sub_02059B08
.public HandleShedinjaEvolution
.public sub_0205B008
.public TEAM_MEMBER_TABLE_PTR

2
asm/include/overlay_29_022E08A0.inc
View File

@ -5,6 +5,7 @@
.public AnimationDelayOrSomething
.public CopyAndInterleaveWrapper
.public DirectoryFileMngr_OpenDirectoryFile
.public DUNGEON_BUTTON_INPUT
.public DUNGEON_PTR
.public DungeonGoesUp
.public GetBgRegionArea
@ -37,7 +38,6 @@
.public ov29_023510E0
.public ov29_02353540
.public ov29_02353544
.public ov29_0237C694
.public ov29_0237C696
.public ov29_0237C698
.public ov29_0237C6A4

2
asm/include/overlay_29_022E9618.inc
View File

@ -8,6 +8,7 @@
.public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
.public DISPLACEMENTS_WITHIN_3
.public DisplayUi
.public DUNGEON_BUTTON_INPUT
.public DUNGEON_PRNG_STATE
.public DUNGEON_PTR
.public DungeonRandInt
@ -45,7 +46,6 @@
.public ov29_023517A2
.public ov29_02353540
.public ov29_02353560
.public ov29_0237C694
.public ov29_0237C850
.public ov29_0237C888
.public RenderWeather3D

2
asm/include/overlay_29_022F05B4.inc
View File

@ -21,6 +21,7 @@
.public DIRECTIONS_XY
.public DrawTextInWindow
.public DrawTileGrid
.public DUNGEON_BUTTON_INPUT
.public DUNGEON_PTR
.public DungeonRandInt
.public EntityIsValid__022F0590
@ -154,7 +155,6 @@
.public ov29_023526F2
.public ov29_023526F4
.public ov29_023535A4
.public ov29_0237C694
.public ov29_0237C6A4
.public ov29_0237C9A4
.public ov29_0237CFBB

2
asm/include/overlay_29_02348020.inc
View File

@ -4,6 +4,7 @@
.public CanSeeTarget
.public DisplayMessage
.public DisplayMessage2
.public DUNGEON_BUTTON_INPUT
.public DUNGEON_PTR
.public DungeonRandInt
.public ExclusiveItemEffectFlagTest
@ -42,7 +43,6 @@
.public ov29_02349AD4
.public ov29_0234C738
.public ov29_023537C4
.public ov29_0237C694
.public PrepareItemForPrinting__02345728
.public SetDungeonEscapeFields
.public SetMessageLogPreprocessorArgsFlagVal

2
asm/include/overlay_29_0234AEE8.inc
View File

@ -6,6 +6,7 @@
.public ChangeDungeonMusic
.public CloseAlertBox
.public CreateAlertBox
.public DUNGEON_BUTTON_INPUT
.public DUNGEON_PTR
.public GetName
.public GetSize0x80Buffer
@ -30,7 +31,6 @@
.public ov29_0233A248
.public ov29_02348A18
.public ov29_02353214
.public ov29_0237C694
.public PreprocessString
.public ShouldDisplayEntityWrapper
.public StringFromId

2
asm/include/overlay_29_0234BEE0.inc
View File

@ -6,6 +6,7 @@
.public DungeonFree
.public DungeonZInit
.public G3X_Reset
.public GetAndStoreButtonInput
.public HandleMenus
.public InitRender3dElement64
.public MemAlloc
@ -26,7 +27,6 @@
.public ov29_022DE300
.public ov29_022DE498
.public ov29_022DE868
.public ov29_022E0A64
.public ov29_022E0CFC
.public ov29_022E0E8C
.public ov29_022E0F14

26
asm/overlay_29_022E08A0.s
View File

@ -176,10 +176,10 @@ ov29_022E0A18: ; 0x022E0A18
_022E0A60: .word DUNGEON_PTR
arm_func_end ov29_022E0A18
arm_func_start ov29_022E0A64
ov29_022E0A64: ; 0x022E0A64
arm_func_start GetAndStoreButtonInput
GetAndStoreButtonInput: ; 0x022E0A64
stmdb sp!, {r3, lr}
ldr r1, _022E0B34 ; =ov29_0237C694
ldr r1, _022E0B34 ; =DUNGEON_BUTTON_INPUT
mov r0, #0
bl GetHeldButtons
ldr r1, _022E0B38 ; =ov29_0237C696
@ -188,7 +188,7 @@ ov29_022E0A64: ; 0x022E0A64
ldr r1, _022E0B3C ; =ov29_0237C698
mov r0, #0
bl sub_020063F4
ldr r0, _022E0B40 ; =ov29_0237C694
ldr r0, _022E0B40 ; =DUNGEON_BUTTON_INPUT
mov r1, #0
strh r1, [r0, #8]
ldrh r1, [r0]
@ -207,11 +207,11 @@ _022E0AB8:
orrlt r1, r1, #2
strlth r1, [r0, #8]
_022E0AD0:
ldr r0, _022E0B40 ; =ov29_0237C694
ldr r0, _022E0B40 ; =DUNGEON_BUTTON_INPUT
mov r1, #0
strh r1, [r0, #0xa]
_022E0ADC:
ldr r0, _022E0B40 ; =ov29_0237C694
ldr r0, _022E0B40 ; =DUNGEON_BUTTON_INPUT
ldrh r1, [r0]
tst r1, #0x100
ldrsh r1, [r0, #0xc]
@ -228,31 +228,31 @@ _022E0B00:
orrlt r1, r1, #0x100
strlth r1, [r0, #8]
_022E0B18:
ldr r0, _022E0B40 ; =ov29_0237C694
ldr r0, _022E0B40 ; =DUNGEON_BUTTON_INPUT
mov r1, #0
strh r1, [r0, #0xc]
_022E0B24:
ldr r0, _022E0B40 ; =ov29_0237C694
ldr r0, _022E0B40 ; =DUNGEON_BUTTON_INPUT
ldrh r1, [r0, #8]
strh r1, [r0, #6]
ldmia sp!, {r3, pc}
.align 2, 0
_022E0B34: .word ov29_0237C694
_022E0B34: .word DUNGEON_BUTTON_INPUT
_022E0B38: .word ov29_0237C696
_022E0B3C: .word ov29_0237C698
_022E0B40: .word ov29_0237C694
arm_func_end ov29_022E0A64
_022E0B40: .word DUNGEON_BUTTON_INPUT
arm_func_end GetAndStoreButtonInput
arm_func_start ov29_022E0B44
ov29_022E0B44: ; 0x022E0B44
ldr r1, _022E0B58 ; =0x000003E7
ldr r0, _022E0B5C ; =ov29_0237C694
ldr r0, _022E0B5C ; =DUNGEON_BUTTON_INPUT
strh r1, [r0, #0xa]
strh r1, [r0, #0xc]
bx lr
.align 2, 0
_022E0B58: .word 0x000003E7
_022E0B5C: .word ov29_0237C694
_022E0B5C: .word DUNGEON_BUTTON_INPUT
arm_func_end ov29_022E0B44
arm_func_start ov29_022E0B60

4
asm/overlay_29_022E9618.s
View File

@ -1063,7 +1063,7 @@ _022EA3B0: .word ov29_02353560
arm_func_start ov29_022EA3B4
ov29_022EA3B4: ; 0x022EA3B4
stmdb sp!, {r4, r5, r6, lr}
ldr r4, _022EA3F0 ; =ov29_0237C694
ldr r4, _022EA3F0 ; =DUNGEON_BUTTON_INPUT
ldr r5, _022EA3F4 ; =ov29_02353560
mov r6, r0
_022EA3C4:
@ -1081,7 +1081,7 @@ _022EA3E0:
bne _022EA3C4
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_022EA3F0: .word ov29_0237C694
_022EA3F0: .word DUNGEON_BUTTON_INPUT
_022EA3F4: .word ov29_02353560
arm_func_end ov29_022EA3B4

62
asm/overlay_29_022F05B4.s
View File

@ -635,7 +635,7 @@ _022F0D44:
bl ov29_022EA370
ldr r4, _022F0ED0 ; =ov29_0237C6A4
ldr r5, _022F0ECC ; =ov29_0237CFBB
ldr r6, _022F0ED4 ; =ov29_0237C694
ldr r6, _022F0ED4 ; =DUNGEON_BUTTON_INPUT
mov fp, #0x2f
_022F0D78:
mov r0, fp
@ -739,7 +739,7 @@ _022F0E64:
_022F0EC8: .word DUNGEON_PTR
_022F0ECC: .word ov29_0237CFBB
_022F0ED0: .word ov29_0237C6A4
_022F0ED4: .word ov29_0237C694
_022F0ED4: .word DUNGEON_BUTTON_INPUT
_022F0ED8: .word 0x00003F03
arm_func_end ov29_022F0C98
@ -1061,7 +1061,7 @@ _022F12E0:
_022F1344:
cmp r8, #0
bne _022F1364
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #1
beq _022F13B0
@ -1320,7 +1320,7 @@ _022F16F4:
cmp r0, #0
movne r1, #0
bne _022F17E0
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
and r0, r0, #0xf0
mov r0, r0, lsl #0x10
@ -1381,7 +1381,7 @@ _022F17E0:
ldr r0, [sp, #0x64]
cmp r0, #0
bne _022F18B4
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #2
beq _022F1868
@ -1425,7 +1425,7 @@ _022F1884:
strne r0, [sp, #0x48]
bne _022F18B4
_022F18A0:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #2]
tst r0, #1
movne r0, #1
@ -1519,7 +1519,7 @@ _022F19DC:
ldr r0, [sp, #0x2c]
cmp r0, #0
bne _022F1A64
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #2
beq _022F1A64
@ -1559,7 +1559,7 @@ _022F1A64:
strb r1, [r0, #0x78e]
b _022F2970
_022F1AA0:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #0x200
cmpeq fp, #0
@ -1724,7 +1724,7 @@ _022F1CC0:
cmp r0, #0
bne _022F2970
_022F1CE0:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #2]
tst r0, #0x400
beq _022F1D10
@ -1767,7 +1767,7 @@ _022F1D10:
strb r0, [sp, #0xba]
b _022F2970
_022F1D84:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #6]
tst r0, #2
beq _022F1DB0
@ -1796,13 +1796,13 @@ _022F1DE0: .word DIRECTIONS_XY
_022F1DE4: .word ov29_0237C9A4
_022F1DE8: .word 0x00000BA3 + SET_LEADER_ACTION_DATA_OFFSET
_022F1DEC: .word ov29_0237C6A4
_022F1DF0: .word ov29_0237C694
_022F1DF0: .word DUNGEON_BUTTON_INPUT
_022F1DF4: .word 0x00000B9A + SET_LEADER_ACTION_DATA_OFFSET
_022F1DF8: .word 0x00000B9B + SET_LEADER_ACTION_DATA_OFFSET
_022F1DFC: .word 0x00000B9C + SET_LEADER_ACTION_DATA_OFFSET
_022F1E00: .word 0x00000708
_022F1E04:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #0x800
bne _022F1E3C
@ -1817,11 +1817,11 @@ _022F1E04:
mov r1, #0
strb r1, [r0, #2]
_022F1E3C:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #0x200
beq _022F1E90
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #2]
tst r0, #2
beq _022F1E90
@ -1842,7 +1842,7 @@ _022F1E88:
_022F1E90:
mov r0, #0
str r0, [sp, #0x44]
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #0x100
beq _022F1ECC
@ -1860,7 +1860,7 @@ _022F1ECC:
mov r1, #0
_022F1ED4:
strb r1, [r0, #1]
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
mov r8, #0
ldrh r0, [r0, #2]
tst r0, #0x800
@ -1995,11 +1995,11 @@ _022F20B8:
ldr r0, [sp, #0x38]
cmp r0, #0
bne _022F20E4
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #0x200
beq _022F20EC
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #2]
tst r0, #0x100
beq _022F20EC
@ -2057,7 +2057,7 @@ _022F2180:
#endif
cmp r0, #0
bne _022F21B4
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #2]
tst r0, #4
beq _022F21B4
@ -2169,16 +2169,16 @@ _022F2324:
ldr r0, _022F1DE4 ; =ov29_0237C9A4
ldrb r0, [r0, #1]
cmp r0, #0
ldreq r0, _022F1DF0 ; =ov29_0237C694
ldreq r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldreqh r1, [r0, #2]
moveq r2, r1
beq _022F2368
_022F234C:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r1, [r0]
ldrb r0, [r5, #0x35]
cmp r0, #0
ldrne r0, _022F1DF0 ; =ov29_0237C694
ldrne r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrneh r2, [r0, #2]
moveq r2, r1
_022F2368:
@ -2404,7 +2404,7 @@ _022F26B8:
add r0, fp, #0x4a
mov r1, #2
bl SetMonsterActionFields
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
mov r1, #2
ldrh r0, [r0]
tst r0, #2
@ -2536,7 +2536,7 @@ _022F2864:
strh r2, [r1, #0xda]
bl PlaySeVolumeWrapper
_022F289C:
ldr r0, _022F1DF0 ; =ov29_0237C694
ldr r0, _022F1DF0 ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #2
ldreq r0, [sp, #0x3c]
@ -3046,7 +3046,7 @@ _022F2FE0: .word 0x000003FF
ov29_022F2FE4: ; 0x022F2FE4
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr r1, _022F3084 ; =DUNGEON_PTR
ldr r2, _022F3088 ; =ov29_0237C694
ldr r2, _022F3088 ; =DUNGEON_BUTTON_INPUT
ldr r6, [r1]
mov r4, #0
ldrb r5, [r6, #0x78c]
@ -3063,7 +3063,7 @@ ov29_022F2FE4: ; 0x022F2FE4
add r0, r0, #0x100
strh r3, [r0, #0xd8]
ldr r0, [r1]
ldr r7, _022F3088 ; =ov29_0237C694
ldr r7, _022F3088 ; =DUNGEON_BUTTON_INPUT
add r0, r0, #0x100
strh r3, [r0, #0xda]
ldrh r0, [r2]
@ -3088,7 +3088,7 @@ _022F3070:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_022F3084: .word DUNGEON_PTR
_022F3088: .word ov29_0237C694
_022F3088: .word DUNGEON_BUTTON_INPUT
arm_func_end ov29_022F2FE4
arm_func_start ShouldLeaderKeepRunning
@ -3996,7 +3996,7 @@ _022F3CC8:
strne r0, [sp, #4]
b _022F3DE0
_022F3D10:
ldr r0, _022F3E9C ; =ov29_0237C694
ldr r0, _022F3E9C ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0]
tst r0, #0x100
and r0, r0, #0xf0
@ -4008,7 +4008,7 @@ _022F3D10:
mov r1, #0
strb r1, [r6, #1]
strh r1, [r6, #4]
ldr r1, _022F3E9C ; =ov29_0237C694
ldr r1, _022F3E9C ; =DUNGEON_BUTTON_INPUT
ldrh r1, [r1, #2]
and r0, r0, r1
_022F3D4C:
@ -4043,7 +4043,7 @@ _022F3DB0:
tst r7, #1
beq _022F3DE0
_022F3DC0:
ldr r0, _022F3E9C ; =ov29_0237C694
ldr r0, _022F3E9C ; =DUNGEON_BUTTON_INPUT
ldrh r0, [r0, #2]
tst r0, #2
movne r4, #1
@ -4110,7 +4110,7 @@ _022F3E94: .word 0x000008E7
_022F3E94: .word 0x00000BA8
#endif
_022F3E98: .word ov29_0237C6A4
_022F3E9C: .word ov29_0237C694
_022F3E9C: .word DUNGEON_BUTTON_INPUT
arm_func_end ov29_022F3B98
arm_func_start ov29_022F3EA0

12
asm/overlay_29_023350FC.s
View File

@ -637,7 +637,7 @@ ov29_02335808: ; 0x02335808
mov r2, #0x1000
strh r3, [r4, #0x14]
str r2, [r4, #0x20]
bl ov29_02335864
bl GetPaletteBaseAddress
ldr r1, _02335860 ; =ov29_0237CA8C
str r0, [r4, #0x24]
mov r0, #0
@ -647,8 +647,8 @@ ov29_02335808: ; 0x02335808
_02335860: .word ov29_0237CA8C
arm_func_end ov29_02335808
arm_func_start ov29_02335864
ov29_02335864: ; 0x02335864
arm_func_start GetPaletteBaseAddress
GetPaletteBaseAddress: ; 0x02335864
ldr r2, _0233587C ; =_020AFC70
add r0, r1, r0, lsl #8
ldr r1, [r2]
@ -657,7 +657,7 @@ ov29_02335864: ; 0x02335864
bx lr
.align 2, 0
_0233587C: .word _020AFC70
arm_func_end ov29_02335864
arm_func_end GetPaletteBaseAddress
arm_func_start DisplayNumberTextureUi
DisplayNumberTextureUi: ; 0x02335880
@ -744,7 +744,7 @@ DisplayCharTextureUi: ; 0x02335988
strh r1, [r6]
ldrsh r1, [sp, #0x10]
strh r2, [r6, #2]
bl ov29_02335864
bl GetPaletteBaseAddress
str r0, [r6, #0x24]
mov r0, r5, lsl #3
ldrsh r1, [r4, r0]
@ -1603,7 +1603,7 @@ ov29_02335F40: ; 0x02335F40
mov r1, r1, asr #0x10
strb r0, [sp, #0x3c]
str r0, [sp, #0x20]
bl ov29_02335864
bl GetPaletteBaseAddress
mov r3, #0x31
ldr r2, _023360F8 ; =ov29_0237CA8C
rsb r1, r3, #0x2740

4
asm/overlay_29_02348020.s
View File

@ -297,7 +297,7 @@ _023483F8:
mov r0, #0
bl ov29_0234C738
mov r6, #2
ldr r4, _0234849C ; =ov29_0237C694
ldr r4, _0234849C ; =DUNGEON_BUTTON_INPUT
b _02348424
_0234840C:
mov r0, r6
@ -340,7 +340,7 @@ _02348490:
ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_02348498: .word ov29_023537C4
_0234849C: .word ov29_0237C694
_0234849C: .word DUNGEON_BUTTON_INPUT
arm_func_end HandleFloorCard
arm_func_start FillMissionDestinationInfo

4
asm/overlay_29_0234AEE8.s
View File

@ -968,7 +968,7 @@ ov29_0234BA54: ; 0x0234BA54
bl WaitUntilAlertBoxTextIsLoaded
mov r4, #0
add r6, r6, #0xc00
ldr r7, _0234BABC ; =ov29_0237C694
ldr r7, _0234BABC ; =DUNGEON_BUTTON_INPUT
b _0234BAAC
_0234BA78:
ldrsh r0, [r6, #0x90]
@ -990,7 +990,7 @@ _0234BAAC:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0234BAB8: .word MESSAGE_LOG_INFO
_0234BABC: .word ov29_0237C694
_0234BABC: .word DUNGEON_BUTTON_INPUT
arm_func_end ov29_0234BA54
arm_func_start InitPortraitDungeon

2
asm/overlay_29_0234BEE0.s
View File

@ -227,7 +227,7 @@ ov29_0234C1D8: ; 0x0234C1D8
beq _0234C1F4
bl sub_02003990
_0234C1F4:
bl ov29_022E0A64
bl GetAndStoreButtonInput
bl ov29_022DDE24
bl ov29_022E9F9C
bl HandleFadesDungeonBothScreens

4
asm/overlay_29_bss_02353860.s
View File

@ -46,8 +46,8 @@ ov29_02373690:
.global ov29_0237C690
ov29_0237C690:
.space 0x4
.global ov29_0237C694
ov29_0237C694:
.global DUNGEON_BUTTON_INPUT
DUNGEON_BUTTON_INPUT:
.space 0x2
.global ov29_0237C696
ov29_0237C696:

4
include/main_02058FA4.h
View File

@ -3,7 +3,7 @@
#include "util.h"
struct unkStruct_sub_02058FCC {
struct unkStruct_02058FCC {
s8 explorer_maze_team_native_language;
u8 field_0x1;
u8 explorer_maze_team_name[20];
@ -12,6 +12,6 @@ struct unkStruct_sub_02058FCC {
};
bool8 ExplorerMazeMonsterExists(void);
void sub_02058FCC(struct unkStruct_sub_02058FCC *ptr);
void sub_02058FCC(struct unkStruct_02058FCC *ptr);
#endif //PMDSKY_MAIN_02058FA4_H

4
include/main_0205B354.h
View File

@ -3,13 +3,13 @@
#include "util.h"
struct unkStruct_sub_0205B354 {
struct unkStruct_0205B354 {
u8 fill0[0x18];
u8 unk18[2];
u8 fill1A[0x45 - 0x1A];
u8 unk45;
};
bool8 sub_0205B354(struct unkStruct_sub_0205B354 *ptr);
bool8 sub_0205B354(struct unkStruct_0205B354 *ptr);
#endif //PMDSKY_MAIN_0205B354_H

2
src/main_02058FA4.c
View File

@ -12,7 +12,7 @@ bool8 ExplorerMazeMonsterExists(void)
return TEAM_MEMBER_TABLE_PTR->explorer_maze_monsters[0].id != MONSTER_NONE;
}
void sub_02058FCC(struct unkStruct_sub_02058FCC *ptr)
void sub_02058FCC(struct unkStruct_02058FCC *ptr)
{
if (ptr != NULL)
{

4
src/main_02059334.c
View File

@ -1,8 +1,8 @@
#include "main_02059334.h"
extern void CopyBitsTo(void *ctx, void *src, s32 nbits);
extern void Copy16BitsTo(struct WriteMonsterInfoToSave_struct *p0, void *p1);
extern void CopyMovesetTo(void *write_info, void *buffer_write);
extern void Copy16BitsTo(void *write_info, void *buf_write);
extern void CopyMovesetTo(struct WriteMonsterInfoToSave_struct *write_info, void *buffer_write);
extern void* memset(void *s, s32 c, u32 n);
extern void CopyBitsFrom(void *read_info, void *buf_read, s32 nbits);
extern void Copy16BitsFrom(void *read_info, void *buf_read);

2
src/main_0205B354.c
View File

@ -1,6 +1,6 @@
#include "main_0205B354.h"
bool8 sub_0205B354(struct unkStruct_sub_0205B354 *ptr)
bool8 sub_0205B354(struct unkStruct_0205B354 *ptr)
{
if (ptr->unk45 != 0)
{