Merge pull request #92 from AnonymousRandomPerson/main

Synced from pmdsky-debug

asm/include/overlay_29_022DEADC.inc

@@ -6,6 +6,7 @@
 .public CountItemsOnFloorForAcuteSniffer
 .public Debug_Print0
 .public DeleteAllMonsterSpriteFiles
+.public DetermineAllMonsterShadow
 .public DetermineAllTilesWalkableNeighbors
 .public DIRECTIONS_XY
 .public DisplayFloorCard
@@ -39,6 +40,7 @@
 .public InitDungeonRng
 .public InitEnemySpawnStats
 .public IsBossFight
+.public IsDungeonEndReasonFailure
 .public IsFloorOver
 .public IsIqEnabled
 .public IsLevelResetDungeon
@@ -100,7 +102,6 @@
 .public ov29_022EAF34
 .public ov29_022EAF48
 .public ov29_022ECDE4
-.public ov29_022ECF44
 .public ov29_022ECF78
 .public ov29_022ECFB8
 .public ov29_022ED030
@@ -119,7 +120,6 @@
 .public ov29_022F7BF4
 .public ov29_022F7E34
 .public ov29_022F7EAC
-.public ov29_022F9970
 .public ov29_022FA2F0
 .public ov29_022FA418
 .public ov29_022FA524
@@ -135,7 +135,6 @@
 .public ov29_022FDFA4
 .public ov29_022FE2E4
 .public ov29_022FE4A8
-.public ov29_02304B64
 .public ov29_02305814
 .public ov29_0231AFB4
 .public ov29_0231B39C
@@ -213,6 +212,7 @@
 .public ov29_023510C8
 .public ov29_02353563
 .public Rand16Bit
+.public ReevaluateSnatchMonster
 .public RefillTeam
 .public ResetGravity
 .public RunFractionalTurn

asm/include/overlay_29_022F7388.inc

@@ -21,6 +21,7 @@
 .public Conversion2IsActive
 .public CopySpawnEntriesMaster
 .public DeleteWanTableEntryVeneer
+.public DetermineMonsterShadow
 .public DIRECTIONS_XY
 .public DirectoryFileMngr_GetDirectoryFileSize
 .public DiscoverMinimap
@@ -164,7 +165,6 @@
 .public ov29_023021F0
 .public ov29_02304830
 .public ov29_02304A48
-.public ov29_02304BAC
 .public ov29_02307CE0
 .public ov29_02307DD0
 .public ov29_0230F9A4

asm/include/overlay_29_02300108.inc

@@ -9,13 +9,13 @@
 .public GetNameWithGender
 .public IsBlinded
 .public IsChargingAnyTwoTurnMove
-.public ShouldMonsterRunAway
-.public StringFromId
 .public ov29_02300D00
 .public ov29_0234B0B4
 .public ov29_023527C0
 .public ov29_023527D0
+.public ShouldMonsterRunAway
 .public strcpy
+.public StringFromId
 .public sub_02024FB8
 .public sub_02056084
 .public sub_02058534

asm/include/overlay_29_02300BF8.inc

@@ -1,22 +1,23 @@
 #pragma once
+.public _s32_div_f
 .public AllocateTemp1024ByteBufferFromPool
 .public CanLearnIqSkill
 .public CanSeeTarget
 .public CanThrowItems
 .public DIRECTIONS_XY
-.public DUNGEON_PTR
 .public DisableIqSkill
+.public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonRandInt
-.public EXCLUSIVE_ITEM_EXP_BOOST
-.public EXCL_ITEM_EFFECTS_WEATHER_NO_STATUS
-.public EXP_ELITE_EXP_BOOST
 .public EnableIqSkill
 .public EntityIsValid__023000E4
 .public EntityIsValid__02302A38
 .public EvolveMonster
+.public EXCL_ITEM_EFFECTS_WEATHER_NO_STATUS
+.public EXCLUSIVE_ITEM_EXP_BOOST
 .public ExclusiveItemEffectFlagTest
 .public ExclusiveItemEffectIsActive__022FFF28
+.public EXP_ELITE_EXP_BOOST
 .public GetApparentWeather
 .public GetEntityNaturalGiftInfo
 .public GetEntityWeatherBallType
@@ -49,10 +50,6 @@
 .public MIRACLE_CHEST_EXP_BOOST
 .public MistIsActive
 .public MultiplyByFixedPoint
-.public SECONDARY_TERRAIN_TYPES
-.public SubstitutePlaceholderStringTags
-.public WONDER_CHEST_EXP_BOOST
-.public _s32_div_f
 .public ov29_022E2470
 .public ov29_022E62A8
 .public ov29_022FAFD4
@@ -75,3 +72,6 @@
 .public ov29_02352798
 .public ov29_023527A0
 .public ov29_023527F8
+.public SECONDARY_TERRAIN_TYPES
+.public SubstitutePlaceholderStringTags
+.public WONDER_CHEST_EXP_BOOST

asm/include/overlay_29_023085DC.inc

@@ -1,11 +1,12 @@
 #pragma once
-.public ATK_STAT_IDX
+.public abs
 .public ApplyDamage
 .public ApplyDamageAndEffectsWrapper
+.public ATK_STAT_IDX
 .public BoostOffensiveStat
 .public CategoryIsNotPhysical
-.public DUNGEON_PTR
 .public DefenderAbilityIsActive__0230A940
+.public DUNGEON_PTR
 .public DungeonRandInt
 .public EntityIsValid__02308FBC
 .public ExclusiveItemEffectIsActive__0230A9B8
@@ -17,9 +18,6 @@
 .public LevitateIsActive
 .public LogMessageByIdWithPopupCheckUserTarget
 .public MonsterIsType
-.public ResetDamageData
-.public UpdateAiTargetPos
-.public abs
 .public ov10_022C442C
 .public ov10_022C4460
 .public ov10_022C4464
@@ -46,3 +44,5 @@
 .public ov29_023380FC
 .public ov29_023535DC
 .public ov29_0237CA6D
+.public ResetDamageData
+.public UpdateAiTargetPos

asm/include/overlay_29_0231513C.inc

@@ -9,6 +9,7 @@
 .public BoostOffensiveStat
 .public CalcStatusDuration
 .public CeilFixedPoint
+.public DetermineMonsterShadow
 .public DisplayAnimatedNumbers
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
@@ -115,7 +116,6 @@
 .public ov29_022EACCC
 .public ov29_022FB984
 .public ov29_02304830
-.public ov29_02304BAC
 .public ov29_0234B09C
 .public ov29_0234B0B4
 .public PERISH_SONG_TURN_RANGE

asm/include/overlay_29_0231B1B8.inc

@@ -34,6 +34,7 @@
 .public CheckVariousConditions
 .public CORSOLA_TWIG_POWER
 .public DealDamageProjectile
+.public DetermineMonsterShadow
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public EndNegativeStatusConditionWrapper
@@ -85,7 +86,6 @@
 .public ov29_022FB920
 .public ov29_022FB9BC
 .public ov29_02304830
-.public ov29_02304BAC
 .public ov29_02307BDC
 .public ov29_0230F9A4
 .public ov29_02344B44

asm/include/overlay_29_0231CBEC.inc

@@ -11,6 +11,7 @@
 .public ChangeShayminForme
 .public CheckVariousStatuses2
 .public ClearMonsterActionFields
+.public DetermineAllMonsterShadow
 .public DetermineTileWalkableNeighbors
 .public DIRECTIONS_XY
 .public DirectoryFileMngr_OpenDirectoryFile
@@ -100,7 +101,6 @@
 .public ov29_023009A0
 .public ov29_023021F0
 .public ov29_023038D4
-.public ov29_02304B64
 .public ov29_02305814
 .public ov29_0233665C
 .public ov29_0233785C

asm/include/overlay_29_0231F594.inc

@@ -4,6 +4,7 @@
 .public AdvanceFrame
 .public AreOrbsAllowedVeneer
 .public AreTrawlOrbsAllowed
+.public DetermineAllMonsterShadow
 .public DetermineTileWalkableNeighbors
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DrawMinimapTile
@@ -19,7 +20,6 @@
 .public MemFree
 .public ov29_022E56A0
 .public ov29_022F62CC
-.public ov29_02304B64
 .public ov29_02336694
 .public ov29_023457C8
 .public RemoveGroundItem

asm/include/overlay_29_0232145C.inc

@@ -6,6 +6,7 @@
 .public AnimationDelayOrSomething
 .public AnimationHasMoreFrames
 .public AreEntitiesAdjacent
+.public AreLateGameTrapsEnabledWrapper
 .public BoostSpeedOneStage
 .public CalcStatusDuration
 .public ChangeMonsterAnimation
@@ -93,7 +94,6 @@
 .public ov29_022EACCC
 .public ov29_022ED0C4
 .public ov29_022ED0D4
-.public ov29_022ED868
 .public ov29_022F87C0
 .public ov29_022F8830
 .public ov29_022F88C0

asm/include/overlay_29_0232A3FC.inc

@@ -6,6 +6,7 @@
 .public AllocateTemp1024ByteBufferFromPool
 .public AnimationDelayOrSomething
 .public ApplyDamageAndEffectsWrapper
+.public AreLateGameTrapsEnabledWrapper
 .public ATK_STAT_IDX
 .public BAG_ITEMS_PTR_MIRROR
 .public BLAZE_KICK_BURN_CHANCE
@@ -67,7 +68,6 @@
 .public ov10_022C6321
 .public ov10_022C6322
 .public ov29_022E2CA0
-.public ov29_022ED868
 .public ov29_022F8FF8
 .public ov29_022F9EA0
 .public ov29_022FFB90

asm/include/overlay_29_0232C524.inc

@@ -1,6 +1,7 @@
 #pragma once
 .public _s32_div_f
 .public AbilityIsActiveVeneer
+.public AreLateGameTrapsEnabledWrapper
 .public ATK_STAT_IDX
 .public BAG_ITEMS_PTR_MIRROR
 .public BoostDefensiveStat
@@ -13,6 +14,7 @@
 .public CountMovesOutOfPp
 .public DealDamage
 .public DealDamageWithTypeAndPowerBoost
+.public DetermineAllMonsterShadow
 .public DetermineTileWalkableNeighbors
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
@@ -71,11 +73,9 @@
 .public ov29_022E6784
 .public ov29_022E8104
 .public ov29_022E81F8
-.public ov29_022ED868
 .public ov29_022FBDE0
 .public ov29_022FBDF0
 .public ov29_022FD7A0
-.public ov29_02304B64
 .public ov29_0230D874
 .public ov29_0230D8E8
 .public ov29_0230D95C

asm/include/overlay_29_023350FC.inc

@@ -9,6 +9,7 @@
 .public Conversion2IsActive
 .public Debug_Print0
 .public DEFAULT_TILE
+.public DetermineMonsterShadow
 .public DIRECTIONS_XY
 .public DisplayCharTextureUi
 .public DrawMinimapTile
@@ -52,7 +53,6 @@
 .public ov29_022E9F80
 .public ov29_022FF958
 .public ov29_02304830
-.public ov29_02304BAC
 .public ov29_02334E70
 .public ov29_02352B4C
 .public ov29_02352B60

asm/include/overlay_29_02337CCC.inc

@@ -1,4 +1,5 @@
 #pragma once
+.public DetermineMonsterShadow
 .public DetermineTileWalkableNeighbors
 .public DIRECTIONS_XY
 .public DrawMinimapTile
@@ -20,7 +21,6 @@
 .public ov29_022E66C4
 .public ov29_022EDEDC
 .public ov29_022FAFD4
-.public ov29_02304BAC
 .public ov29_02306D54
 .public ov29_02336694
 .public PositionIsOnHiddenStairs

asm/include/overlay_29_023498A0.inc

@@ -41,6 +41,7 @@
 .public GetMonsterPreEvolution
 .public GetName
 .public GetPerformanceFlagWithChecks
+.public GetRandomExplorerMazeMonster
 .public GetRandomSpawnMonsterID
 .public GetSecondFormIfValid
 .public GetSpecialTargetItem
@@ -119,7 +120,6 @@
 .public ov29_022EAFB0
 .public ov29_022F2FE4
 .public ov29_022F42D8
-.public ov29_022F99EC
 .public ov29_022FA3D4
 .public ov29_022FBA54
 .public ov29_022FBBEC

asm/overlay_29_022DEADC.s

@@ -881,7 +881,7 @@ _022DF6F8:
 	bl ClearHiddenStairs
 	b _022DF750
 _022DF74C:
-	bl ov29_022F9970
+	bl ReevaluateSnatchMonster
 _022DF750:
 	bl ov29_022F7EAC
 	bl ov29_0233665C
@@ -894,7 +894,7 @@ _022DF750:
 	bl ov29_022FA2F0
 	b _022DF780
 _022DF778:
-	bl ov29_02304B64
+	bl DetermineAllMonsterShadow
 	bl ov29_022FA524
 _022DF780:
 	mov r0, #1
@@ -1585,7 +1585,7 @@ _022E00EC:
 _022E0150:
 	cmp sl, #0
 	beq _022E026C
-	bl ov29_022ECF44
+	bl IsDungeonEndReasonFailure
 	cmp r0, #0
 	beq _022E01D8
 	ldr r0, _022DFF40 ; =DUNGEON_PTR

asm/overlay_29_022ECDE4.s

@@ -109,8 +109,8 @@ _022ECF3C: .word 0x00000A41
 _022ECF40: .word 0x000003E7
 	arm_func_end ov29_022ECDE4
 
-	arm_func_start ov29_022ECF44
-ov29_022ECF44: ; 0x022ECF44
+	arm_func_start IsDungeonEndReasonFailure
+IsDungeonEndReasonFailure: ; 0x022ECF44
 	ldr r1, _022ECF6C ; =DUNGEON_PTR
 	ldr r0, _022ECF70 ; =0x0002CA66
 	ldr r2, [r1]
@@ -129,7 +129,7 @@ _022ECF70: .word 0x0002C9C2
 _022ECF70: .word 0x0002CA66
 #endif
 _022ECF74: .word 0x00000279
-	arm_func_end ov29_022ECF44
+	arm_func_end IsDungeonEndReasonFailure
 
 	arm_func_start ov29_022ECF78
 ov29_022ECF78: ; 0x022ECF78
@@ -803,8 +803,8 @@ BindTrapToTile: ; 0x022ED858
 	bx lr
 	arm_func_end BindTrapToTile
 
-	arm_func_start ov29_022ED868
-ov29_022ED868: ; 0x022ED868
+	arm_func_start AreLateGameTrapsEnabledWrapper
+AreLateGameTrapsEnabledWrapper: ; 0x022ED868
 	ldr r0, _022ED880 ; =DUNGEON_PTR
 	ldr ip, _022ED884 ; =AreLateGameTrapsEnabled
 	ldr r0, [r0]
@@ -818,7 +818,7 @@ ov29_022ED868: ; 0x022ED868
 	.align 2, 0
 _022ED880: .word DUNGEON_PTR
 _022ED884: .word AreLateGameTrapsEnabled
-	arm_func_end ov29_022ED868
+	arm_func_end AreLateGameTrapsEnabledWrapper
 
 	arm_func_start ov29_022ED888
 ov29_022ED888: ; 0x022ED888