Synced from pmdsky-debug

pret · Sep 4, 2024 · fdadd56 · fdadd56
1 parent 1a82c65
commit fdadd56
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 40 deletions.
diff --git a/asm/include/overlay_29_022DC2B8.inc b/asm/include/overlay_29_022DC2B8.inc
@@ -34,11 +34,11 @@
 .public GetApparentWeather
 .public GetBgRegionArea
 .public GetDefaultTileTextureId
-.public GetDungeonGenInfoUnk0C
 .public GetDungeonMode
 .public GetDungeonRngPreseed
 .public GetFloorType
 .public GetForcedLossReason
+.public GetHiddenFloorField
 .public GetLeader
 .public GetMaxReachedFloor
 .public GetMaxRescueAttempts
@@ -170,8 +170,6 @@
 .public ov29_0233785C
 .public ov29_0233845C
 .public ov29_0233873C
-.public ov29_02338868
-.public ov29_02338898
 .public ov29_023388B0
 .public ov29_023389C4
 .public ov29_02338A4C
@@ -271,6 +269,8 @@
 .public SetDungeonRngPreseed
 .public SetDungeonRngPreseed23Bit
 .public SetForcedLossReason
+.public SetHiddenFloorField
+.public SetHiddenStairsField
 .public SetMaxReachedFloor
 .public SetMinimapDataE447
 .public SpawnInitialMonsters

diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc
@@ -10,6 +10,7 @@
 .public EnemyEvolution
 .public EnsureCanStandCurrentTile
 .public EntityIsValid__022FED98
+.public GetHiddenStairsField
 .public HasHeldItem
 .public IqSkillIsEnabled
 .public IsChargingAnyTwoTurnMove
@@ -56,16 +57,15 @@
 .public ov29_0231A8A0
 .public ov29_0231A9F8
 .public ov29_02337CCC
-.public ov29_02338708
-.public ov29_02338850
-.public ov29_02338898
 .public ov29_02346888
 .public ov29_0234B024
 .public ov29_0234BA54
 .public ov29_0235171E
 .public ov29_0237C9C0
 .public ov29_0237CA68
 .public ov29_0237CA6C
+.public PositionIsOnHiddenStairs
+.public SetHiddenFloorField
 .public SubstitutePlaceholderStringTags
 .public TryActivateFlashFireOnAllMonsters
 .public TrySpawnTrapperTrap

diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc
@@ -143,7 +143,6 @@
 .public ov29_02300BF8
 .public ov29_023021F0
 .public ov29_02302388
-.public ov29_02338708
 .public ov29_0233A0E8
 .public ov29_023468FC
 .public ov29_02346E5C
@@ -167,6 +166,7 @@
 .public PlayWindowInputSound
 .public PopInventoryMenuField0x1A3
 .public PositionHasItem
+.public PositionIsOnHiddenStairs
 .public PreprocessString
 .public PreprocessStringFromId
 .public PrintIqSkillsMenu

diff --git a/asm/overlay_29_022DC2B8.s b/asm/overlay_29_022DC2B8.s
@@ -3160,7 +3160,7 @@ ov29_022DEBBC: ; 0x022DEBBC
 #endif
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
-	bl GetDungeonGenInfoUnk0C
+	bl GetHiddenFloorField
 	mov r4, r0
 	mov r0, #0
 	bl SetForcedLossReason
@@ -3226,7 +3226,7 @@ ov29_022DEBBC: ; 0x022DEBBC
 	cmp r5, #0
 	ldmneia sp!, {r3, r4, r5, pc}
 	mov r0, #0
-	bl ov29_02338868
+	bl SetHiddenStairsField
 	bl ov29_02349188
 	ldr r2, _022DEF2C ; =DUNGEON_PTR
 	mov r0, #0
@@ -3382,7 +3382,7 @@ _022DEF08:
 	streqb r1, [r0, #0xda + OV29_022DEBBC_OFFSET]
 _022DEF20:
 	mov r0, #0
-	bl ov29_02338898
+	bl SetHiddenFloorField
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _022DEF2C: .word DUNGEON_PTR
@@ -3753,7 +3753,7 @@ _022DF460:
 	ldr r0, _022DFF54 ; =LEADER_PTR
 	mov r1, #0
 	str r1, [r0]
-	bl GetDungeonGenInfoUnk0C
+	bl GetHiddenFloorField
 	mov r6, r0
 	bl SetBothScreensWindowColorToDefault
 	ldr r1, _022DFF40 ; =DUNGEON_PTR
@@ -3769,7 +3769,7 @@ _022DF460:
 	mov r1, #0xa
 	add r0, r0, #0x700
 	strh r1, [r0, #0x88]
-	bl GetDungeonGenInfoUnk0C
+	bl GetHiddenFloorField
 	cmp r0, #0
 	bne _022DF4E4
 	bl GenerateDungeonRngSeed
@@ -4621,7 +4621,7 @@ _022E008C:
 	bl ov29_022ECDE4
 	b _022E00EC
 _022E00C8:
-	bl GetDungeonGenInfoUnk0C
+	bl GetHiddenFloorField
 	cmp r0, #0
 	bne _022DF428
 	ldr r0, _022DFF40 ; =DUNGEON_PTR

diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s
@@ -358,21 +358,21 @@ _022FF3D4:
 	ldrb r2, [r5, #0x4c]
 	add r0, r6, #4
 	strb r2, [r1]
-	bl ov29_02338708
+	bl PositionIsOnHiddenStairs
 	cmp r0, #0
 	beq _022FF5E0
-	bl ov29_02338850
+	bl GetHiddenStairsField
 	cmp r0, #1
 	bne _022FF41C
 	mov r0, #1
-	bl ov29_02338898
+	bl SetHiddenFloorField
 	b _022FF5E0
 _022FF41C:
-	bl ov29_02338850
+	bl GetHiddenStairsField
 	cmp r0, #2
 	bne _022FF5E0
 	mov r0, #2
-	bl ov29_02338898
+	bl SetHiddenFloorField
 	b _022FF5E0
 _022FF434:
 	mov r0, r6
@@ -995,21 +995,21 @@ _022FE9A8:
 	ldrb r2, [r6, #0x4c]
 	add r0, sb, #4
 	strb r2, [r1]
-	bl ov29_02338708
+	bl PositionIsOnHiddenStairs
 	cmp r0, #0
 	beq _022FEBB4
-	bl ov29_02338850
+	bl GetHiddenStairsField
 	cmp r0, #1
 	bne _022FE9F0
 	mov r0, #1
-	bl ov29_02338898
+	bl SetHiddenFloorField
 	b _022FEBB4
 _022FE9F0:
-	bl ov29_02338850
+	bl GetHiddenStairsField
 	cmp r0, #2
 	bne _022FEBB4
 	mov r0, #2
-	bl ov29_02338898
+	bl SetHiddenFloorField
 	b _022FEBB4
 _022FEA08:
 	mov r0, sb

diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s
@@ -644,7 +644,7 @@ ov29_02338430: ; 0x02338430
 	mov r1, #1
 	bl ov29_022EDEDC
 	mov r0, r4
-	bl ov29_02338708
+	bl PositionIsOnHiddenStairs
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, #1
@@ -974,8 +974,8 @@ HiddenStairsPresent: ; 0x023386D8
 _02338704: .word DUNGEON_PTR
 	arm_func_end HiddenStairsPresent
 
-	arm_func_start ov29_02338708
-ov29_02338708: ; 0x02338708
+	arm_func_start PositionIsOnHiddenStairs
+PositionIsOnHiddenStairs: ; 0x02338708
 	ldr r1, _02338738 ; =DUNGEON_PTR
 	ldrsh r2, [r0]
 	ldr r1, [r1]
@@ -996,7 +996,7 @@ ov29_02338708: ; 0x02338708
 	bx lr
 	.align 2, 0
 _02338738: .word DUNGEON_PTR
-	arm_func_end ov29_02338708
+	arm_func_end PositionIsOnHiddenStairs
 
 	arm_func_start ov29_0233873C
 ov29_0233873C: ; 0x0233873C
@@ -1095,8 +1095,8 @@ _0233884C: .word 0x00000F31
 #endif
 	arm_func_end HiddenStairsTrigger
 
-	arm_func_start ov29_02338850
-ov29_02338850: ; 0x02338850
+	arm_func_start GetHiddenStairsField
+GetHiddenStairsField: ; 0x02338850
 	ldr r0, _02338864 ; =DUNGEON_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x4000
@@ -1108,10 +1108,10 @@ ov29_02338850: ; 0x02338850
 	bx lr
 	.align 2, 0
 _02338864: .word DUNGEON_PTR
-	arm_func_end ov29_02338850
+	arm_func_end GetHiddenStairsField
 
-	arm_func_start ov29_02338868
-ov29_02338868: ; 0x02338868
+	arm_func_start SetHiddenStairsField
+SetHiddenStairsField: ; 0x02338868
 	ldr r1, _0233887C ; =DUNGEON_PTR
 	ldr r1, [r1]
 	add r1, r1, #0x4000
@@ -1123,10 +1123,10 @@ ov29_02338868: ; 0x02338868
 	bx lr
 	.align 2, 0
 _0233887C: .word DUNGEON_PTR
-	arm_func_end ov29_02338868
+	arm_func_end SetHiddenStairsField
 
-	arm_func_start GetDungeonGenInfoUnk0C
-GetDungeonGenInfoUnk0C: ; 0x02338880
+	arm_func_start GetHiddenFloorField
+GetHiddenFloorField: ; 0x02338880
 	ldr r0, _02338894 ; =DUNGEON_PTR
 	ldr r0, [r0]
 	add r0, r0, #0x4000
@@ -1138,10 +1138,10 @@ GetDungeonGenInfoUnk0C: ; 0x02338880
 	bx lr
 	.align 2, 0
 _02338894: .word DUNGEON_PTR
-	arm_func_end GetDungeonGenInfoUnk0C
+	arm_func_end GetHiddenFloorField
 
-	arm_func_start ov29_02338898
-ov29_02338898: ; 0x02338898
+	arm_func_start SetHiddenFloorField
+SetHiddenFloorField: ; 0x02338898
 	ldr r1, _023388AC ; =DUNGEON_PTR
 	ldr r1, [r1]
 	add r1, r1, #0x4000
@@ -1153,7 +1153,7 @@ ov29_02338898: ; 0x02338898
 	bx lr
 	.align 2, 0
 _023388AC: .word DUNGEON_PTR
-	arm_func_end ov29_02338898
+	arm_func_end SetHiddenFloorField
 
 	arm_func_start ov29_023388B0
 ov29_023388B0: ; 0x023388B0

diff --git a/asm/overlay_31.s b/asm/overlay_31.s
@@ -531,7 +531,7 @@ ov31_02382ED4: ; 0x02382ED4
 	moveq r4, #1
 	beq _02382F50
 	add r0, r5, #4
-	bl ov29_02338708
+	bl PositionIsOnHiddenStairs
 	cmp r0, #0
 	movne r4, #3
 _02382F50: