Decompile RunDungeon and make adjustments to dungeon and dungeon_init structs

This commit is contained in:
Sören Fetsch
2026-10-13 20:16:54 +00:00
parent fc85040831
commit df64c43ec6
17 changed files with 1514 additions and 1890 deletions

View File

@@ -1,262 +1,18 @@
#pragma once
.public AllocTopScreenStatus
.public ChangeGiratinaFormIfSkyDungeon
.public ClearHiddenStairs
.public CloseFixedBin
.public CopySpawnEntriesOnce
.public CountItemsOnFloorForAcuteSniffer
.public CreateMonsterSummaryFromEntityOuter
.public Debug_Print0
.public DeleteAllMonsterSpriteFiles
.public DetermineAllMonsterShadow
.public DetermineAllTilesWalkableNeighbors
.public DIRECTIONS_XY
.public DisplayFloorCard
.public DisplayFloorTip
.public DisplayMessage
.public DisplayMessage2
.public DUNGEON_PTR
.public DungeonGoesUp
.public DungeonRandInt
.public DungeonRngUnsetSecondary
.public EnemyEvolution
.public EntityIsValid__022E0354
.public FadeToBlack
.public FillMissionDestinationInfo
.public FIXED_ROOM_REVISIT_OVERRIDES
.public FreeAlertBoxInfo
.public FreeLoadedAttackSpriteAndMore
.public FreeTopScreenStatus
.public GenerateDungeonRngSeed
.public GenerateFloor
.public GetApparentWeather
.public GetBgRegionArea
.public FillMissionDestinationInfo
.public GetDungeonMode
.public GetDungeonRngPreseed
.public GetFloorType
.public GetForcedLossReason
.public GetHiddenFloorField
.public GetLeader
.public GetMaxReachedFloor
.public GetMaxRescueAttempts
.public GetTopScreenOption
.public GetTurnLimit
.public HandleShopTransaction
.public IncrementNbSteals
.public InitAlertBoxInfo
.public InitDungeonRng
.public InitEnemySpawnStats
.public InitMessageLogPreprocessorArgs
.public IsBossFight
.public IsDungeonEndReasonFailure
.public IsFloorOver
.public IsIqEnabled
.public IsLevelResetDungeon
.public IsRoomIlluminated
.public IsSecretBazaarVeneer
.public IsTrapInvisibleWhenAttacking
.public LEADER_PTR
.public LoadActiveMonsterSprites
.public LoadMappaFileAttributes
.public LoadMonsterSprites
.public LoadScriptVariableValue
.public LoadWeather3DFiles
.public MemZero
.public MtInit
.public MtNext
.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 ov29_022DD5B4
.public ov29_022DD7AC
.public ov29_022DDE00
.public ov29_022DE15C
.public ov29_022DE4FC
.public ov29_022DE904
.public ov29_022DE930
.public ov29_022DEA34
.public ov29_022DEADC
.public ov29_022DEB40
.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_022E2B68
.public ov29_022E2DFC
.public ov29_022E34B0
.public ov29_022E3A58
.public ov29_022E5F20
.public ov29_022E6E40
.public ov29_022E6F94
.public ov29_022E7CFC
.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_022EAD68
.public ov29_022EAEAC
.public ov29_022EAF48
.public ov29_022ECF78
.public ov29_022ECFB8
.public ov29_022ED030
.public ov29_022ED0B0
.public ov29_022EF738
.public ov29_022EF8A4
.public ov29_022EF9B8
.public ov29_022F6E40
.public ov29_022F6EF4
.public ov29_022F7104
.public ov29_022F7910
.public ov29_022F7BF4
.public ov29_022F7E34
.public ov29_022F7EAC
.public ov29_022FA2F0
.public ov29_022FA418
.public ov29_022FA524
.public ov29_022FA648
.public ov29_022FA750
.public ov29_022FBB1C
.public ov29_022FC9C0
.public ov29_022FCD04
.public ov29_022FDFA4
.public ov29_022FE2E4
.public ov29_022FE4A8
.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_0233873C
.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_02348850
.public ov29_02348894
.public ov29_023488C8
.public ov29_02348918
.public ov29_02348994
.public ov29_02349188
.public ov29_02349658
.public ov29_02349C84
.public ov29_0234B010
.public ov29_0234B1A4
.public ov29_0234B4CC
.public ov29_0234BB10
.public ov29_0234BB20
.public ov29_0234BB2C
.public ov29_0234BB38
.public ov29_0234C584
.public ov29_0234C5EC
.public ov29_0234C654
.public ov29_0234CA84
.public ov29_0234CB34
.public ov29_0234CB54
.public ov29_023510C0
.public ov29_023510C8
.public ov29_02353563
.public Rand16Bit
.public ReadMissionMtStateLower
.public ReevaluateSnatchMonster
.public RefillTeam
.public ResetGravity
.public ResetVictoryCounter
.public RunFractionalTurn
.public SetBaseStatsMovesGroundMonster
.public SetBothScreensWindowColorToDefault
.public SetDungeonRngPreseed
.public SetDungeonRngPreseed23Bit
.public SetEntityPixelPosXY
.public SetForcedLossReason
.public SetHiddenFloorField
.public SetHiddenStairsField
.public SetMaxReachedFloor
.public SetMessageLogPreprocessorArgsFlagVal
.public SetMessageLogPreprocessorArgsNumberVal
.public SetMinimapDataE447
.public SetUnkMusicFlag
.public SpawnInitialMonsters
.public SpawnShopkeepers
.public SpawnTeam
.public SpawnTraps
.public StartFadeDungeonWrapper
.public sub_02001808
.public sub_02009194
.public sub_020091B0
.public sub_02017B00
.public sub_0204F1B4
.public sub_02051DFC
.public sub_02051ED4
.public sub_02057E90
.public sub_02057EF4
.public sub_02058644
.public sub_0205B77C
.public TryActivateAcuteSniffer
.public TryActivateArtificialWeatherAbilities
.public TryActivateIqBooster
.public TryActivateNewFloorHpRestoration
.public TryActivateNewFloorPpRestoration
.public TryActivateSlowStart
.public TryActivateStairSensor
.public TryActivateWeather
.public TryForcedLoss
.public TryInflictBurnStatusWholeTeam
.public TrySpawnDoughSeedPoke
.public UnkMapRelatedFunc
.public UpdateMinimap
.public UpdateShouldBoostHiddenStairsSpawnChance
.public UpdateShouldBoostKecleonShopSpawnChance
.public UpdateTrapsVisibility
.public WaitUntilAlertBoxPauseIsOver
.public WaitUntilAlertBoxTextIsLoaded
.public WaitUntilFadeIsFinished
.public WriteMissionMtState
.public ov29_022DEADC
.public ov29_022DEB40
.public ov29_02349188
.public ov29_02349658

View File

@@ -0,0 +1 @@
#pragma once

File diff suppressed because it is too large Load Diff

View File

@@ -1524,174 +1524,3 @@ ov29_023510B8:
.global ov29_023510BC
ov29_023510BC:
.byte 0x00, 0x00, 0x00, 0x00
.global ov29_023510C0
ov29_023510C0:
.byte 0xA2, 0x01, 0xA3, 0x01, 0xA4, 0x01, 0xA5, 0x01
.global ov29_023510C8
ov29_023510C8:
.byte 0x44, 0x47, 0x5F, 0x56
.byte 0x52, 0x41, 0x4D, 0x5F, 0x53, 0x50, 0x52, 0x49, 0x54, 0x45, 0x5F, 0x4E, 0x41, 0x4D, 0x45, 0x3A
.byte 0x25, 0x64, 0x0A, 0x00
.global ov29_023510E0
ov29_023510E0:
.byte 0xD0, 0x01, 0x20, 0x00, 0xD1, 0x01, 0x40, 0x00, 0xD2, 0x01, 0x80, 0x00
.byte 0xD4, 0x01, 0x20, 0x00, 0xD5, 0x01, 0x40, 0x00, 0xD6, 0x01, 0x00, 0x01, 0xDA, 0x01, 0x20, 0x00
.byte 0xDB, 0x01, 0x20, 0x00, 0xDC, 0x01, 0x20, 0x00, 0xDD, 0x01, 0x20, 0x00, 0xDE, 0x01, 0x80, 0x00
.global ov29_0235110C
ov29_0235110C:
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
.byte 0x01, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
.byte 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF
.byte 0x03, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF
.byte 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF
.byte 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
.byte 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
.global ov29_0235118C
ov29_0235118C:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351194
ov29_02351194:
.byte 0x0C, 0x00, 0x0D, 0x00, 0x0D, 0x00, 0x06, 0x03
.global ov29_0235119C
ov29_0235119C:
.byte 0x0A, 0x00, 0x0B, 0x00, 0x0B, 0x00, 0x07, 0x03
.global ov29_023511A4
ov29_023511A4:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x08
.global ov29_023511B0
ov29_023511B0:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_MUZZLED
STATUS_ICON_ARRAY_MUZZLED:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_MAGNET_RISE
STATUS_ICON_ARRAY_MAGNET_RISE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.global ov29_023511DC
ov29_023511DC:
.byte 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x3F, 0x11, 0x03, 0x00, 0x3F, 0x00, 0x3F, 0x12, 0x03, 0x00, 0x3F
.global STATUS_ICON_ARRAY_MIRACLE_EYE
STATUS_ICON_ARRAY_MIRACLE_EYE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_LEECH_SEED
STATUS_ICON_ARRAY_LEECH_SEED:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_LONG_TOSS
STATUS_ICON_ARRAY_LONG_TOSS:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_0235122C
ov29_0235122C:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x4B, 0x01, 0x00, 0x00, 0xEF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x00, 0x00, 0x00
.global ov29_0235124C
ov29_0235124C:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x4B, 0x01, 0x00, 0x00, 0xEF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xB8, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_BLINDED
STATUS_ICON_ARRAY_BLINDED:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_BURN
STATUS_ICON_ARRAY_BURN:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_SURE_SHOT
STATUS_ICON_ARRAY_SURE_SHOT:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_INVISIBLE
STATUS_ICON_ARRAY_INVISIBLE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_SLEEP
STATUS_ICON_ARRAY_SLEEP:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_CURSE
STATUS_ICON_ARRAY_CURSE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_FREEZE
STATUS_ICON_ARRAY_FREEZE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_CRINGE
STATUS_ICON_ARRAY_CRINGE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_BIDE
STATUS_ICON_ARRAY_BIDE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351464
ov29_02351464:
.byte 0x78, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x79, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x7A, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x7B, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x7C, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7D, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x7E, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x7F, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0xBA, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xBB, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_REFLECT
STATUS_ICON_ARRAY_REFLECT:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351584
ov29_02351584:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351594
ov29_02351594:
.byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C
.byte 0x41, 0x4E, 0x43, 0x45, 0x2F, 0x6D, 0x61, 0x70, 0x70, 0x61, 0x5F, 0x74, 0x2E, 0x62, 0x69, 0x6E
.byte 0x00, 0x00, 0x00, 0x00
.global ov29_023515B0
ov29_023515B0:
.byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C, 0x41, 0x4E, 0x43, 0x45
.byte 0x2F, 0x6D, 0x61, 0x70, 0x70, 0x61, 0x5F, 0x79, 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00
.global ov29_023515CC
ov29_023515CC:
.byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C, 0x41, 0x4E, 0x43, 0x45, 0x2F, 0x6D, 0x61, 0x70
.byte 0x70, 0x61, 0x5F, 0x73, 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00
.global ov29_023515E8
ov29_023515E8:
.byte 0x02, 0x00, 0x01, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00
.global DUNGEON_CONTROLS_MENU_WINDOW_PARAMS
DUNGEON_CONTROLS_MENU_WINDOW_PARAMS:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14
.byte 0x01, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

View File

@@ -0,0 +1,172 @@
.include "asm/macros.inc"
.include "overlay_29_rodata_023510C8.inc"
.rodata
.global ov29_023510C8
ov29_023510C8:
.byte 0x44, 0x47, 0x5F, 0x56
.byte 0x52, 0x41, 0x4D, 0x5F, 0x53, 0x50, 0x52, 0x49, 0x54, 0x45, 0x5F, 0x4E, 0x41, 0x4D, 0x45, 0x3A
.byte 0x25, 0x64, 0x0A, 0x00
.global ov29_023510E0
ov29_023510E0:
.byte 0xD0, 0x01, 0x20, 0x00, 0xD1, 0x01, 0x40, 0x00, 0xD2, 0x01, 0x80, 0x00
.byte 0xD4, 0x01, 0x20, 0x00, 0xD5, 0x01, 0x40, 0x00, 0xD6, 0x01, 0x00, 0x01, 0xDA, 0x01, 0x20, 0x00
.byte 0xDB, 0x01, 0x20, 0x00, 0xDC, 0x01, 0x20, 0x00, 0xDD, 0x01, 0x20, 0x00, 0xDE, 0x01, 0x80, 0x00
.global ov29_0235110C
ov29_0235110C:
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
.byte 0x01, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF
.byte 0x02, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF
.byte 0x03, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF
.byte 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF
.byte 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
.byte 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x04, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF
.global ov29_0235118C
ov29_0235118C:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351194
ov29_02351194:
.byte 0x0C, 0x00, 0x0D, 0x00, 0x0D, 0x00, 0x06, 0x03
.global ov29_0235119C
ov29_0235119C:
.byte 0x0A, 0x00, 0x0B, 0x00, 0x0B, 0x00, 0x07, 0x03
.global ov29_023511A4
ov29_023511A4:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x08
.global ov29_023511B0
ov29_023511B0:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_MUZZLED
STATUS_ICON_ARRAY_MUZZLED:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_MAGNET_RISE
STATUS_ICON_ARRAY_MAGNET_RISE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
.global ov29_023511DC
ov29_023511DC:
.byte 0x00, 0x3F, 0x00, 0x3F, 0x00, 0x3F, 0x11, 0x03, 0x00, 0x3F, 0x00, 0x3F, 0x12, 0x03, 0x00, 0x3F
.global STATUS_ICON_ARRAY_MIRACLE_EYE
STATUS_ICON_ARRAY_MIRACLE_EYE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_LEECH_SEED
STATUS_ICON_ARRAY_LEECH_SEED:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_LONG_TOSS
STATUS_ICON_ARRAY_LONG_TOSS:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_0235122C
ov29_0235122C:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x4B, 0x01, 0x00, 0x00, 0xEF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x00, 0x00, 0x00
.global ov29_0235124C
ov29_0235124C:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x4B, 0x01, 0x00, 0x00, 0xEF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xB8, 0x01, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_BLINDED
STATUS_ICON_ARRAY_BLINDED:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_BURN
STATUS_ICON_ARRAY_BURN:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_SURE_SHOT
STATUS_ICON_ARRAY_SURE_SHOT:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_INVISIBLE
STATUS_ICON_ARRAY_INVISIBLE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_SLEEP
STATUS_ICON_ARRAY_SLEEP:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_CURSE
STATUS_ICON_ARRAY_CURSE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_FREEZE
STATUS_ICON_ARRAY_FREEZE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_CRINGE
STATUS_ICON_ARRAY_CRINGE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_BIDE
STATUS_ICON_ARRAY_BIDE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351464
ov29_02351464:
.byte 0x78, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x79, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x7A, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x7B, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x7C, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7D, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x7E, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x7F, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0xBA, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xBB, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global STATUS_ICON_ARRAY_REFLECT
STATUS_ICON_ARRAY_REFLECT:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351584
ov29_02351584:
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ov29_02351594
ov29_02351594:
.byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C
.byte 0x41, 0x4E, 0x43, 0x45, 0x2F, 0x6D, 0x61, 0x70, 0x70, 0x61, 0x5F, 0x74, 0x2E, 0x62, 0x69, 0x6E
.byte 0x00, 0x00, 0x00, 0x00
.global ov29_023515B0
ov29_023515B0:
.byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C, 0x41, 0x4E, 0x43, 0x45
.byte 0x2F, 0x6D, 0x61, 0x70, 0x70, 0x61, 0x5F, 0x79, 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00
.global ov29_023515CC
ov29_023515CC:
.byte 0x72, 0x6F, 0x6D, 0x30, 0x3A, 0x42, 0x41, 0x4C, 0x41, 0x4E, 0x43, 0x45, 0x2F, 0x6D, 0x61, 0x70
.byte 0x70, 0x61, 0x5F, 0x73, 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00
.global ov29_023515E8
ov29_023515E8:
.byte 0x02, 0x00, 0x01, 0x00
.byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00
.global DUNGEON_CONTROLS_MENU_WINDOW_PARAMS
DUNGEON_CONTROLS_MENU_WINDOW_PARAMS:
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14
.byte 0x01, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

View File

@@ -1,8 +1,12 @@
#ifndef PMDSKY_OVERLAY_29_022E0354_H
#define PMDSKY_OVERLAY_29_022E0354_H
#include "dungeon_init.h"
#include "dungeon.h"
#include "dungeon_mode.h"
// Runs the main dungeon gameplay loop (location 0x022DEF38)
s32 RunDungeon(struct dungeon_init *dungeon_init_data, struct dungeon *dungeon);
// Checks if an entity pointer points to a valid entity (not entity type 0, which represents no entity).
bool8 EntityIsValid__022E0354(struct entity *entity);

View File

@@ -2,6 +2,7 @@
#define PMDSKY_DUNGEON_H
#include "dungeon_mode.h"
#include "dungeon_location_seed.h"
#include "enums.h"
#include "item.h"
@@ -663,19 +664,13 @@ struct dungeon {
enum dungeon_group_id group_id; // 0x74A: Same for different segments of a dungeon
u8 field_0x74b;
// 0x74C: Used as an input to GetDungeonMode, and uses output to determine if the
// override fixed room should be loaded?
u16 field_0x74c;
// override fixed room should be loaded
s16 dungeon_idx;
u8 field_0x74e;
u8 field_0x74f;
// 0x750: A ldr instruction is used at this address? Maybe used for something else before
// the rescue floor number is set?
u8 field_0x750;
u8 rescue_floor; // 0x751: Floor number where the rescue point is, if applicable
u8 field_0x752;
u8 field_0x753;
// 0x754: Should also be prng_pressed_23_bit? dungeon_init::prng_preseed_23_bit gets copied
// here, but might not be used?
u32 prng_preseed_23_bit;
// 0x750: Rescue parameters copied from dungeon_init::rescue_location_seed.
// The seed at 0x754 is a redundant copy; the active seed is at 0x7A0.
dungeon_location_seed rescue_location_seed;
// 0x758: Whether the current floor should continue or end and why
enum floor_loop_status floor_loop_status;
bool8 recruiting_enabled; // 0x759: Recruitment is allowed in this dungeon
@@ -1512,9 +1507,7 @@ struct dungeon {
// 0x1990C: Stores statuses::unique_id for the monster pointed to by dungeon::snatch_monster.
u32 snatch_status_unique_id;
// 0x19910: Spawn genid of the monster to be spawned by the effect of Illuminate
u16 illuminate_spawn_genid;
u8 field_0x19912;
u8 field_0x19913;
u32 illuminate_spawn_genid;
// 0x19914: List that matches monster IDs with their sprite index on this floor
enum monster_id sprite_indexes[1155];
u8 field_0x1a21a;

View File

@@ -2,7 +2,9 @@
#define PMDSKY_DUNGEON_INIT
#include "common.h"
#include "dungeon_location_seed.h"
#include "util.h"
#include "item.h"
// Unknown struct used during dungeon initialisation
struct unk {
@@ -20,9 +22,9 @@ struct unk_dungeon_init {
struct dungeon_init {
u8 id; // 0x0: Copied into dungeon::id
u8 floor; // 0x1: Copied into dungeon::floor
// Copied into dungeon::field_0x74C, might be related to the dungeon being conquered or
// Copied into dungeon::dungeon_idx, might be related to the dungeon being conquered or
// the fixed room overrides.
u16 dungeon_idx; // 0x2 index of the dungeon. The index maps to the id in DUNGEON_SWAP_ID_TABLE
s16 dungeon_idx; // 0x2 index of the dungeon. The index maps to the id in DUNGEON_SWAP_ID_TABLE
u8 field_0x4;
bool8 nonstory_flag; // 0x5: Copied into dungeon::nonstory_flag
bool8 recruiting_enabled; // 0x6: Copied into dungeon::recruiting_enabled
@@ -37,8 +39,8 @@ struct dungeon_init {
bool8 send_home_disabled; // 0xA: Copied into dungeon::send_home_disabled
bool8 hidden_land_flag; // 0xB: Copied into dungeon::hidden_land_flag
bool8 skip_faint_animation_flag; // 0xC: Copied into dungeon::skip_faint_animation_flag
// 0xD: Copied into dungeon::dungeon_objective. Read as a signed byte (?).
u8 dungeon_objective;
// 0xD: Copied into dungeon::dungeon_objective.
s8 dungeon_objective;
s8 field_0xE;
bool8 has_guest_pokemon; // 0xF: If true, a guest pokémon will be added to your team
bool8 send_help_item; // 0x10: If true, you recive an item at the start of the dungeon
@@ -46,43 +48,29 @@ struct dungeon_init {
// have left
s8 field_0x12;
u8 field_0x13;
// 0x14
// [EU]0x22DF920 loads this as a word
// [EU]0x22DFBAC loads this as a signed byte
// ???
u32 field_0x14; // Copied into dungeon::field_0x750
// 0x18: The dungeon PRNG preseed? Copied into dungeon::prng_preseed_23_bit and
// dungeon::rescue_prng_preseed_23_bit.
u32 prng_preseed_23_bit;
// 0x14: Copied as an eight-byte block into dungeon::rescue_location_seed.
// For rescues, the seed at 0x18 also initializes the active dungeon::rescue_prng_preseed_23_bit.
dungeon_location_seed rescue_location_seed;
// 0x1C: Array containing the list of quest pokémon that will join the team in the dungeon
// (max 2)
struct ground_monster guest_pokemon[2];
// 0xA4: Used as a base address at [EU]0x22E0354 and [EU]0x22E03AC.
// It's probably a separate struct.
u8 field_0xA4;
u8 field_0xA5;
u8 field_0xA6;
u8 field_0xA7;
// 0xA8: ID of the item to give to the player if send_help_item is true
/* struct item_id_16 */ u16 help_item;
// 0xA4: Item information for the help item, copied into the entity info of the item entity
struct item help_item;
u8 field_0xAA;
u8 field_0xAB;
// 0xAC: Controls which version of the dungeon to load. Gets copied into
// dungeon::dungeon_game_version_id. Uncertain when the game decides to load the
// Time/Darkness version of dungeons.
enum game_id dungeon_game_version_id;
u32 field_0xB0;
s32 field_0xB0;
u8 field_0xB4; // Gets set to dungeon::id during dungeon init
u8 field_0xB5; // Gets set to dungeon::floor during dungeon init
u8 field_0xB6;
u8 field_0xB7;
// 0xB8: Used as a base address at [EU]0x22E0ABC.
// It's probably a separate struct.
u8 field_0xB8; // Gets set to dungeon::id during dungeon init
u8 field_0xB9; // Gets set to dungeon::floor during dungeon init
u8 field_0xBA;
u8 field_0xBB;
u32 field_0xBC;
// 0xB8: Output location and seed populated by RunDungeon on failure when
// field_0xB0 is set to -2. Contains the current dungeon ID, floor, and
// rescue PRNG preseed (at 0xBC); the two remaining bytes are cleared.
dungeon_location_seed result_location_seed;
// 0xC0: Used as a base address at [EU]0x22E0A4C
struct unk_dungeon_init field_0xC0;
u8 field_0x1A8;

View File

@@ -0,0 +1,28 @@
#ifndef PMDSKY_DUNGEON_LOCATION_SEED_H
#define PMDSKY_DUNGEON_LOCATION_SEED_H
#include <nitro/types.h>
#include <nitro/misc.h>
#include "enums.h"
// Eight-byte dungeon location and PRNG preseed. RunDungeon copies the input
// at dungeon_init + 0x14 to dungeon + 0x750, and populates a separate output
// at dungeon_init + 0xB8 on a failure path.
typedef struct dungeon_location_seed {
union {
u32 raw;
struct {
enum dungeon_id dungeon_id; // 0x0
u8 floor; // 0x1: For rescue input, the target floor checked by GetFloorType
u8 field_0x2; // Unknown; cleared in the output block
u8 field_0x3; // Unknown, possibly padding; cleared in the output block
};
};
// 0x4: PRNG preseed. RunDungeon copies the rescue input directly from dungeon_init
// to dungeon::rescue_prng_preseed_23_bit; no independent use of the copy
// inside dungeon::rescue_location_seed has been identified. The output
// block receives dungeon::rescue_prng_preseed_23_bit.
u32 prng_preseed_23_bit;
} dungeon_location_seed;
#endif // PMDSKY_DUNGEON_LOCATION_SEED_H

View File

@@ -11,7 +11,7 @@ void ov29_022EA2A4(u32 param_1);
void ov29_022EA324(u32 param_1);
void ov29_022EA370(s32 a, s32 b);
void ov29_022EA3B4(s32 param_1);
void ov29_022EA3F8(void);
void ov29_022EA3F8(s32 unused0, s32 unused1);
s32 ov29_022EA408(void);
void ov29_022EA418(u8 param_1);
void UnkMapRelatedFunc(s32 switch_case, u32 param_2);

View File

@@ -6,9 +6,9 @@
void WaitUntilAlertBoxPauseIsOver(u32 param_1);
void InitPortraitDungeon(portrait_params *portrait, enum monster_id monster_id, u8 emotion);
void ov29_0234BB10(void);
void ov29_0234BB20(s32 a);
void ov29_0234BB2C(s32 a);
void ov29_0234BB38(s32 a);
void ov29_0234BB20(void);
void ov29_0234BB2C(void);
void ov29_0234BB38(void);
void ov29_0234BB44(s32 a);
void ov29_0234BB50(s32 a);
s32 OpenMessageLog(s32 param_1, s32 param_2);

View File

@@ -760,6 +760,8 @@ Overlay OVY_29
{
After OVY_10
Object asm/overlay_29_rodata_0234FD04.o
Object src/deoxys_form_data.o
Object asm/overlay_29_rodata_023510C8.o
Object asm/overlay_29_data_023534E0.o
Object asm/overlay_29_bss_02353860.o
Object src/poly_text.o

4
src/deoxys_form_data.c Normal file
View File

@@ -0,0 +1,4 @@
#include <nitro/types.h>
// Monster IDs of Deoxys's Normal, Attack, Defense, and Speed forms, respectively.
const s16 DEOXYS_FORMS[4] = {0x1A2, 0x1A3, 0x1A4, 0x1A5};

1257
src/dg.c

File diff suppressed because it is too large Load Diff

View File

@@ -236,7 +236,7 @@ void ov29_022EA3B4(s32 param_1)
} while (DUNGEON_BUTTON_INPUT[0] & 0xF0);
}
void ov29_022EA3F8(void)
void ov29_022EA3F8(s32 unused0, s32 unused1)
{
ov29_022DE638(0x100);
}

View File

@@ -11,9 +11,9 @@ extern void sub_0204833C(void);
extern s32 sub_02048360(void);
extern void sub_02048240(s32 a);
extern void sub_02048150(s32 a);
extern void sub_02048134(s32 a);
extern void sub_020480CC(s32 a);
extern void sub_0204804C(s32 a);
extern void sub_02048134(void);
extern void sub_020480CC(void);
extern void sub_0204804C(void);
extern void sub_02047FFC(s32 a);
extern void InitPortraitParams(portrait_params *portrait);
extern void AllowPortraitDefault(portrait_params *portrait, bool32 allow);
@@ -62,19 +62,19 @@ void ov29_0234BB10(void)
sub_02047FFC(0);
}
void ov29_0234BB20(s32 a)
void ov29_0234BB20(void)
{
sub_0204804C(a);
sub_0204804C();
}
void ov29_0234BB2C(s32 a)
void ov29_0234BB2C(void)
{
sub_020480CC(a);
sub_020480CC();
}
void ov29_0234BB38(s32 a)
void ov29_0234BB38(void)
{
sub_02048134(a);
sub_02048134();
}
void ov29_0234BB44(s32 a)

View File

@@ -3,6 +3,8 @@
#include "overlay_29_022DC61C.h"
#include "overlay_29_0234CA68.h"
#include "util.h"
#include "dg.h"
#include "overlay_29_022DEAB0.h"
struct unk_ov29_023537DC {
s32 v0;
@@ -31,8 +33,6 @@ void sub_02051DD0(s32, s32);
void sub_02051E60(s32, s32);
void ov29_0234BEE0(s32);
void ov29_0234BF04(s32);
s32 GetDungeonPtrMaster();
void RunDungeon(void *, s32);
s32 sub_0205BAB0(void *);
void ov29_022DE418();
void sub_020091B0(s32, s32);
@@ -54,6 +54,7 @@ void ov29_0234BBE8(void)
s32 uVar4;
s32 uVar5;
s32 iVar6;
struct dungeon *dungeon;
bool8 bVar1 = FALSE;
struct unk_ov29_023537DC *iVar7 = ov29_023537D8.v4;
ov29_022DC61C(); // mem init?
@@ -106,8 +107,8 @@ void ov29_0234BBE8(void)
ov29_0234BEE0(1);
ov29_0234BF04(0);
ov29_0234BF04(1);
uVar3 = GetDungeonPtrMaster();
RunDungeon(&(ov29_023537D8.v4[1]), uVar3);
dungeon = GetDungeonPtrMaster();
RunDungeon((struct dungeon_init *)&ov29_023537D8.v4[1], dungeon);
bVar1 = TRUE;
break;
case 2: