Decomped ov29_022DEADC

Decomped by ElectricGeorge
This commit is contained in:
AnonymousRandomPerson 2025-06-15 17:51:17 -05:00
parent 89acbf9b5c
commit 2aca93a387
6 changed files with 57 additions and 66 deletions

View File

@ -4,24 +4,24 @@
.public ClearHiddenStairs
.public CloseFixedBin
.public CountItemsOnFloorForAcuteSniffer
.public DIRECTIONS_XY
.public DUNGEON_PTR
.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 FIXED_ROOM_REVISIT_OVERRIDES
.public FadeToBlack
.public FillMissionDestinationInfo
.public FIXED_ROOM_REVISIT_OVERRIDES
.public FreeLoadedAttackSpriteAndMore
.public FreeTopScreenStatus
.public GenerateDungeonRngSeed
@ -54,6 +54,36 @@
.public LoadWeather3DFiles
.public MemZero
.public OpenFixedBin
.public Rand16Bit
.public ReevaluateSnatchMonster
.public RefillTeam
.public ResetGravity
.public RunFractionalTurn
.public SetBaseStatsMovesGroundMonster
.public SetBothScreensWindowColorToDefault
.public SetDungeonRngPreseed
.public SetDungeonRngPreseed23Bit
.public SetEntityPixelPosXY
.public SetForcedLossReason
.public SetHiddenFloorField
.public SetHiddenStairsField
.public SetMaxReachedFloor
.public SetMinimapDataE447
.public SpawnInitialMonsters
.public SpawnShopkeepers
.public SpawnTeam
.public StartFadeDungeonWrapper
.public TryActivateArtificialWeatherAbilities
.public TryActivateIqBooster
.public TryActivateSlowStart
.public TryActivateWeather
.public TryForcedLoss
.public TryInflictBurnStatusWholeTeam
.public TrySpawnDoughSeedPoke
.public UpdateMinimap
.public UpdateShouldBoostHiddenStairsSpawnChance
.public UpdateShouldBoostKecleonShopSpawnChance
.public UpdateTrapsVisibility
.public ov10_022BDAB0
.public ov10_022BDB54
.public ov10_022BDB60
@ -70,6 +100,7 @@
.public ov29_022DE904
.public ov29_022DE930
.public ov29_022DEA34
.public ov29_022DEADC
.public ov29_022E0434
.public ov29_022E081C
.public ov29_022E0DFC
@ -211,25 +242,6 @@
.public ov29_023510C0
.public ov29_023510C8
.public ov29_02353563
.public Rand16Bit
.public ReevaluateSnatchMonster
.public RefillTeam
.public ResetGravity
.public RunFractionalTurn
.public SetBaseStatsMovesGroundMonster
.public SetBothScreensWindowColorToDefault
.public SetDungeonRngPreseed
.public SetDungeonRngPreseed23Bit
.public SetEntityPixelPosXY
.public SetForcedLossReason
.public SetHiddenFloorField
.public SetHiddenStairsField
.public SetMaxReachedFloor
.public SetMinimapDataE447
.public SpawnInitialMonsters
.public SpawnShopkeepers
.public SpawnTeam
.public StartFadeDungeonWrapper
.public sub_02001808
.public sub_02009194
.public sub_020091B0
@ -246,14 +258,3 @@
.public sub_0205B77C
.public sub_020634F4
.public sub_02063504
.public TryActivateArtificialWeatherAbilities
.public TryActivateIqBooster
.public TryActivateSlowStart
.public TryActivateWeather
.public TryForcedLoss
.public TryInflictBurnStatusWholeTeam
.public TrySpawnDoughSeedPoke
.public UpdateMinimap
.public UpdateShouldBoostHiddenStairsSpawnChance
.public UpdateShouldBoostKecleonShopSpawnChance
.public UpdateTrapsVisibility

View File

@ -1,37 +1,8 @@
.include "asm/macros.inc"
.include "overlay_29_022DEADC.inc"
.include "overlay_29_022DEB40.inc"
.text
arm_func_start ov29_022DEADC
ov29_022DEADC: ; 0x022DEADC
stmdb sp!, {r3, lr}
mov r0, #0x20
bl ov29_0234C654
mov r0, #0
mov r1, r0
bl sub_020091B0
mov r0, #1
mov r1, #0
bl sub_020091B0
mov r0, #2
mov r1, #0
bl sub_02009194
mov r0, #3
mov r1, #0
bl sub_02009194
mov r0, #4
mov r1, #0
bl sub_020091B0
mov r0, #1
mov r1, #0x4000
mov r2, #0
bl StartFadeDungeonWrapper
mov r0, #0
bl ov29_0234C738
ldmia sp!, {r3, pc}
arm_func_end ov29_022DEADC
arm_func_start ov29_022DEB40
ov29_022DEB40: ; 0x022DEB40
stmdb sp!, {r3, lr}

View File

@ -12,5 +12,6 @@ struct dungeon* GetDungeonPtrMaster(void);
void DungeonZInit(void);
// Frees the dungeons struct pointer to by the master dungeon pointer, and nullifies the pointer.
void DungeonFree(void);
void ov29_022DEADC();
#endif //PMDSKY_OVERLAY_29_022DEAB0_H

View File

@ -266,7 +266,7 @@ Overlay OVY_29
Object src/overlay_29_022DC61C.o
Object asm/overlay_29_022DC65C.o
Object src/overlay_29_022DEAB0.o
Object asm/overlay_29_022DEADC.o
Object asm/overlay_29_022DEB40.o
Object src/dg.o
Object asm/overlay_29_022E0378.o
Object src/overlay_29_022E1610.o

View File

@ -5,6 +5,12 @@ extern struct dungeon* DUNGEON_PTR[];
void MemFree(void* ptr);
void MemZero(void* ptr, u32 len);
void* MemAlloc(u32 len, u32 flags);
void ov29_0234C654(s32);
void sub_020091B0(s32, s32);
void sub_02009194(s32, s32);
void sub_020091B0(s32, s32);
void StartFadeDungeonWrapper(s32, s32, s32);
void ov29_0234C738(s32);
struct dungeon* DungeonAlloc(void)
{
@ -13,7 +19,7 @@ struct dungeon* DungeonAlloc(void)
#else
void* buf = MemAlloc(0x0002CB14,0);
#endif
DUNGEON_PTR[1]=buf;
}
@ -39,3 +45,15 @@ void DungeonFree(void)
MemFree(DUNGEON_PTR[1]);
DUNGEON_PTR[1]=0;
}
void ov29_022DEADC()
{
ov29_0234C654(0x20);
sub_020091B0(0, 0);
sub_020091B0(1, 0);
sub_02009194(2, 0);
sub_02009194(3, 0);
sub_020091B0(4, 0);
StartFadeDungeonWrapper(1, 0x4000, 0);
ov29_0234C738(0);
}

View File

@ -37,7 +37,7 @@ s32 sub_0205BAB0(void *);
void ov29_022DE418();
void sub_020091B0(s32, s32);
void sub_02009194(s32, s32);
void StartFadeDungeonWrapper(s32,s32,s32);
void StartFadeDungeonWrapper(s32, s32, s32);
void ov29_0234C738(s32);
void SetAdventureLogDungeonFloor(void *);
void StopBgmCommand();