Merge pull request #69 from AnonymousRandomPerson/main

Synced from pmdsky-debug
pret · Sep 4, 2024 · 2ed173f · 2ed173f
2 parents e48c983 + fdadd56
commit 2ed173f
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 61 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_022F7388.inc b/asm/include/overlay_29_022F7388.inc
@@ -52,6 +52,7 @@
 .public GetConversion2ConvertToType
 .public GetDefensiveStatAtLevel
 .public GetDirectionTowardsPosition
+.public GetExclusiveItemWithEffectFromBag
 .public GetExp
 .public GetExplorerMazeMonster
 .public GetFloorType
@@ -167,7 +168,6 @@
 .public ov29_02304BAC
 .public ov29_02307CE0
 .public ov29_02307DD0
-.public ov29_0230F654
 .public ov29_0230F9A4
 .public ov29_023159D4
 .public ov29_02337EC0

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_29_022FEDBC.inc b/asm/include/overlay_29_022FEDBC.inc
@@ -12,6 +12,7 @@
 .public EXCL_ITEM_EFFECTS_WEATHER_MOVE_SPEED_BOOST
 .public ExclusiveItemEffectFlagTest
 .public GetApparentWeather
+.public GetExclusiveItemWithEffectFromBag
 .public GetMobilityType
 .public GetSpeedStatus
 .public GetTile
@@ -28,7 +29,6 @@
 .public ov29_022E655C
 .public ov29_022FAA04
 .public ov29_02300DCC
-.public ov29_0230F654
 .public ov29_02318D58
 .public ov29_02322374
 .public ov29_02344B44

diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc
@@ -23,6 +23,7 @@
 .public GetEntityNaturalGiftInfo
 .public GetEntityWeatherBallType
 .public GetEvolutions
+.public GetExclusiveItemWithEffectFromBag
 .public GetExplorerMazeMonster
 .public GetForcedLossReason
 .public GetMobilityTypeCheckSlipAndFloating
@@ -60,7 +61,6 @@
 .public ov29_022FBDE0
 .public ov29_02302C04
 .public ov29_02302CC8
-.public ov29_0230F654
 .public ov29_02314DC4
 .public ov29_02324BE8
 .public ov29_02344B44

diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc
@@ -12,6 +12,7 @@
 .public EntityIsValid__023118B4
 .public EntityIsValid__02315118
 .public ExclusiveItemEffectFlagTest
+.public GetExclusiveItemWithEffectFromBag
 .public GetTile
 .public GetTileAtEntity
 .public HasHeldItem
@@ -78,7 +79,6 @@
 .public ov29_023018AC
 .public ov29_02304A48
 .public ov29_02304A84
-.public ov29_0230F654
 .public ov29_02344B44
 .public ov29_0234B034
 .public ov29_0234B084

diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc
@@ -343,6 +343,7 @@
 .public GetDamageSourceWrapper
 .public GetDirectionTowardsPosition
 .public GetEntityMoveTargetAndRange
+.public GetExclusiveItemWithEffectFromBag
 .public GetMoveCategory
 .public GetMoveCritChance
 .public GetMovePower
@@ -402,7 +403,6 @@
 .public ov29_02304C3C
 .public ov29_02307BDC
 .public ov29_0230D088
-.public ov29_0230F654
 .public ov29_02314DC4
 .public ov29_0231AD38
 .public ov29_023201D0

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_022F7388.s b/asm/overlay_29_022F7388.s
@@ -4728,7 +4728,7 @@ _022FAC04:
 	mov r0, sb
 	mov r1, #0x47
 	add r2, sp, #0xc
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	mov r0, #1
 	add r1, sp, #0xc
 	bl ov29_02344B44

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_022FEDBC.s b/asm/overlay_29_022FEDBC.s
@@ -1608,7 +1608,7 @@ _02300068:
 	add r2, sp, #0
 	mov r0, sl
 	mov r1, r7
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	add r1, sp, #0
 	mov r0, #0
 	bl ov29_02344B44

diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s
@@ -2344,7 +2344,7 @@ ov29_02301A84: ; 0x02301A84
 	add r2, sp, #0
 	mov r0, r4
 	mov r1, r6
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	add r1, sp, #0
 	mov r0, #1
 	bl ov29_02344B44
@@ -3173,7 +3173,7 @@ IsProtectedFromNegativeStatus: ; 0x02302430
 	add r2, sp, #0
 	mov r0, r5
 	mov r1, #0x59
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	add r1, sp, #0
 	mov r0, #1
 	bl ov29_02344B44

diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s
@@ -483,8 +483,8 @@ _0230F64C: .word 0x00000C62 + TRY_NON_LEADER_ITEM_PICK_UP_OFFSET
 _0230F650: .word 0x00000C63 + TRY_NON_LEADER_ITEM_PICK_UP_OFFSET
 	arm_func_end TryNonLeaderItemPickUp
 
-	arm_func_start ov29_0230F654
-ov29_0230F654: ; 0x0230F654
+	arm_func_start GetExclusiveItemWithEffectFromBag
+GetExclusiveItemWithEffectFromBag: ; 0x0230F654
 	stmdb sp!, {r3, r4, r5, r6, lr}
 	sub sp, sp, #0xc
 	mov r6, r0
@@ -515,7 +515,7 @@ ov29_0230F654: ; 0x0230F654
 _0230F6C0:
 	add sp, sp, #0xc
 	ldmia sp!, {r3, r4, r5, r6, pc}
-	arm_func_end ov29_0230F654
+	arm_func_end GetExclusiveItemWithEffectFromBag
 
 	arm_func_start AuraBowIsActive
 AuraBowIsActive: ; 0x0230F6C8

diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s
@@ -3468,7 +3468,7 @@ _023145F4:
 	add r2, sp, #4
 	mov r0, sb
 	mov r1, #1
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	add r1, sp, #4
 	mov r0, #1
 	bl ov29_02344B44
@@ -4062,7 +4062,7 @@ ExclusiveItemEffectIsActiveWithLogging: ; 0x02314D40
 	ldrb r1, [sp, #0x20]
 	add r2, sp, #0
 	mov r0, r6
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	add r1, sp, #0
 	mov r0, #1
 	bl ov29_02344B44
@@ -4094,7 +4094,7 @@ ov29_02314DC4: ; 0x02314DC4
 	add r2, sp, #0
 	mov r0, r6
 	mov r1, r4
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	add r1, sp, #0
 	mov r0, #1
 	bl ov29_02344B44

diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s
@@ -556,7 +556,7 @@ _0232EFDC:
 	beq _0232F188
 	mov r0, sb
 	mov r1, r4
-	bl ov29_02332FC8
+	bl CanHitWithRegularAttack
 	cmp r0, #0
 	beq _0232F188
 	ldr r0, [sp, #0x40]
@@ -565,7 +565,7 @@ _0232EFDC:
 	mov r0, r4
 	mov r1, #0x21
 	add r2, sp, #0xac
-	bl ov29_0230F654
+	bl GetExclusiveItemWithEffectFromBag
 	cmp r0, #0
 	beq _0232F060
 	mov r0, #0
@@ -625,7 +625,7 @@ _0232F090:
 	bne _0232F188
 	mov r0, sb
 	mov r1, r4
-	bl ov29_02332FC8
+	bl CanHitWithRegularAttack
 	cmp r0, #0
 	beq _0232F188
 	mov r0, r4
@@ -5125,8 +5125,8 @@ _02332FC0:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
 	arm_func_end ov29_02332F18
 
-	arm_func_start ov29_02332FC8
-ov29_02332FC8: ; 0x02332FC8
+	arm_func_start CanHitWithRegularAttack
+CanHitWithRegularAttack: ; 0x02332FC8
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	mov r4, r1
@@ -5160,7 +5160,7 @@ _02333018:
 	moveq r0, #0
 	and r0, r0, #0xff
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov29_02332FC8
+	arm_func_end CanHitWithRegularAttack
 
 	arm_func_start ov29_02333044
 ov29_02333044: ; 0x02333044