From 1e98ba5b08355288008780f1ada51228dd3522cf Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Fri, 22 Nov 2024 22:38:35 -0500 Subject: [PATCH] Synced from pmdsky-debug --- asm/include/overlay_29_022DEADC.inc | 6 +++--- asm/include/overlay_29_022F7388.inc | 2 +- asm/include/overlay_29_02300108.inc | 4 ++-- asm/include/overlay_29_02300BF8.inc | 16 ++++++++-------- asm/include/overlay_29_023085DC.inc | 10 +++++----- asm/include/overlay_29_0231513C.inc | 2 +- asm/include/overlay_29_0231B1B8.inc | 2 +- asm/include/overlay_29_0231CBEC.inc | 2 +- asm/include/overlay_29_0231F594.inc | 2 +- asm/include/overlay_29_0232145C.inc | 2 +- asm/include/overlay_29_0232A3FC.inc | 2 +- asm/include/overlay_29_0232C524.inc | 4 ++-- asm/include/overlay_29_023350FC.inc | 2 +- asm/include/overlay_29_02337CCC.inc | 2 +- asm/include/overlay_29_023498A0.inc | 2 +- asm/overlay_29_022DEADC.s | 6 +++--- asm/overlay_29_022ECDE4.s | 12 ++++++------ asm/overlay_29_022F7388.s | 14 +++++++------- asm/overlay_29_023047DC.s | 14 +++++++------- asm/overlay_29_0231513C.s | 2 +- asm/overlay_29_0231B1B8.s | 2 +- asm/overlay_29_0231CBEC.s | 2 +- asm/overlay_29_0231F594.s | 2 +- asm/overlay_29_0232145C.s | 2 +- asm/overlay_29_0232A3FC.s | 2 +- asm/overlay_29_0232C524.s | 8 ++++---- asm/overlay_29_023350FC.s | 4 ++-- asm/overlay_29_02337CCC.s | 2 +- asm/overlay_29_023498A0.s | 2 +- 29 files changed, 67 insertions(+), 67 deletions(-) diff --git a/asm/include/overlay_29_022DEADC.inc b/asm/include/overlay_29_022DEADC.inc index 33199aed..9bf08555 100644 --- a/asm/include/overlay_29_022DEADC.inc +++ b/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 diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index e51916eb..a12a07be 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/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 diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index 887a79cb..8d087e6b 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/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 diff --git a/asm/include/overlay_29_02300BF8.inc b/asm/include/overlay_29_02300BF8.inc index 112fc38c..5a5e6a21 100644 --- a/asm/include/overlay_29_02300BF8.inc +++ b/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 diff --git a/asm/include/overlay_29_023085DC.inc b/asm/include/overlay_29_023085DC.inc index a3191125..8fb3f198 100644 --- a/asm/include/overlay_29_023085DC.inc +++ b/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 diff --git a/asm/include/overlay_29_0231513C.inc b/asm/include/overlay_29_0231513C.inc index e17b7853..f5157e43 100644 --- a/asm/include/overlay_29_0231513C.inc +++ b/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 diff --git a/asm/include/overlay_29_0231B1B8.inc b/asm/include/overlay_29_0231B1B8.inc index cf14fa06..f6ccca78 100644 --- a/asm/include/overlay_29_0231B1B8.inc +++ b/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 diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index bb94501d..afb8919e 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/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 diff --git a/asm/include/overlay_29_0231F594.inc b/asm/include/overlay_29_0231F594.inc index 9ea3b82d..daec70dd 100644 --- a/asm/include/overlay_29_0231F594.inc +++ b/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 diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index d6a5a819..c18bc307 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/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 diff --git a/asm/include/overlay_29_0232A3FC.inc b/asm/include/overlay_29_0232A3FC.inc index 9878e9ba..a2b07bc1 100644 --- a/asm/include/overlay_29_0232A3FC.inc +++ b/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 diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc index 5fed7959..ded6aa9d 100644 --- a/asm/include/overlay_29_0232C524.inc +++ b/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 diff --git a/asm/include/overlay_29_023350FC.inc b/asm/include/overlay_29_023350FC.inc index 0edc8a6a..8f93d5b1 100644 --- a/asm/include/overlay_29_023350FC.inc +++ b/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 diff --git a/asm/include/overlay_29_02337CCC.inc b/asm/include/overlay_29_02337CCC.inc index fa35654c..f48045cc 100644 --- a/asm/include/overlay_29_02337CCC.inc +++ b/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 diff --git a/asm/include/overlay_29_023498A0.inc b/asm/include/overlay_29_023498A0.inc index dbfc0b36..d135a284 100644 --- a/asm/include/overlay_29_023498A0.inc +++ b/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 diff --git a/asm/overlay_29_022DEADC.s b/asm/overlay_29_022DEADC.s index 47278ed1..fd6599e5 100644 --- a/asm/overlay_29_022DEADC.s +++ b/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 diff --git a/asm/overlay_29_022ECDE4.s b/asm/overlay_29_022ECDE4.s index ab2123aa..546049c2 100644 --- a/asm/overlay_29_022ECDE4.s +++ b/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 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index d610ffbb..ee71f4c0 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -1746,7 +1746,7 @@ _022F87A8: ldrb r1, [r4, #7] mov r0, sb strb r1, [sb, #0x25] - bl ov29_02304BAC + bl DetermineMonsterShadow ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} .align 2, 0 _022F87BC: .word DUNGEON_PTR @@ -3136,8 +3136,8 @@ ov29_022F996C: ; 0x022F996C bx lr arm_func_end ov29_022F996C - arm_func_start ov29_022F9970 -ov29_022F9970: ; 0x022F9970 + arm_func_start ReevaluateSnatchMonster +ReevaluateSnatchMonster: ; 0x022F9970 #ifdef JAPAN #define OV29_022F9970_OFFSET -0xA4 #else @@ -3178,10 +3178,10 @@ _022F99DC: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022F99E8: .word DUNGEON_PTR - arm_func_end ov29_022F9970 + arm_func_end ReevaluateSnatchMonster - arm_func_start ov29_022F99EC -ov29_022F99EC: ; 0x022F99EC + arm_func_start GetRandomExplorerMazeMonster +GetRandomExplorerMazeMonster: ; 0x022F99EC stmdb sp!, {r4, r5, r6, r7, r8, lr} sub sp, sp, #0x40 mov r4, #0 @@ -3224,7 +3224,7 @@ _022F9A68: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _022F9A70: .word DUNGEON_PTR - arm_func_end ov29_022F99EC + arm_func_end GetRandomExplorerMazeMonster arm_func_start RestorePpAllMovesSetFlags RestorePpAllMovesSetFlags: ; 0x022F9A74 diff --git a/asm/overlay_29_023047DC.s b/asm/overlay_29_023047DC.s index 95da371d..84663282 100644 --- a/asm/overlay_29_023047DC.s +++ b/asm/overlay_29_023047DC.s @@ -300,8 +300,8 @@ _02304B58: ldmia sp!, {r3, r4, r5, r6, r7, pc} arm_func_end ov29_02304B14 - arm_func_start ov29_02304B64 -ov29_02304B64: ; 0x02304B64 + arm_func_start DetermineAllMonsterShadow +DetermineAllMonsterShadow: ; 0x02304B64 stmdb sp!, {r4, r5, r6, lr} ldr r4, _02304BA8 ; =DUNGEON_PTR mov r5, #0 @@ -319,7 +319,7 @@ _02304B70: cmp r0, #0 beq _02304B98 mov r0, r6 - bl ov29_02304BAC + bl DetermineMonsterShadow _02304B98: add r5, r5, #1 cmp r5, #0x14 @@ -327,10 +327,10 @@ _02304B98: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _02304BA8: .word DUNGEON_PTR - arm_func_end ov29_02304B64 + arm_func_end DetermineAllMonsterShadow - arm_func_start ov29_02304BAC -ov29_02304BAC: ; 0x02304BAC + arm_func_start DetermineMonsterShadow +DetermineMonsterShadow: ; 0x02304BAC stmdb sp!, {r4, r5, r6, lr} mov r4, r0 bl GetTileAtEntity @@ -378,7 +378,7 @@ _02304C24: _02304C30: .word ov29_02352808 _02304C34: .word DUNGEON_PTR _02304C38: .word SECONDARY_TERRAIN_TYPES - arm_func_end ov29_02304BAC + arm_func_end DetermineMonsterShadow arm_func_start ov29_02304C3C ov29_02304C3C: ; 0x02304C3C diff --git a/asm/overlay_29_0231513C.s b/asm/overlay_29_0231513C.s index 93a688fb..dad157ed 100644 --- a/asm/overlay_29_0231513C.s +++ b/asm/overlay_29_0231513C.s @@ -2607,7 +2607,7 @@ _02317350: strh r5, [r8, #4] mov r0, sb strh r4, [sb, #0xa8] - bl ov29_02304BAC + bl DetermineMonsterShadow mov r0, sb bl ov29_022E47C4 mov r0, sb diff --git a/asm/overlay_29_0231B1B8.s b/asm/overlay_29_0231B1B8.s index 5bb26ec0..266ef66a 100644 --- a/asm/overlay_29_0231B1B8.s +++ b/asm/overlay_29_0231B1B8.s @@ -359,7 +359,7 @@ _0231B5F4: mov r0, r8 bl ov29_02304830 mov r0, r8 - bl ov29_02304BAC + bl DetermineMonsterShadow mov r0, r8 bl SetMonsterTypeAndAbility mov r0, #1 diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 04e924cb..3621ce73 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -2594,7 +2594,7 @@ _0231ED08: bl ov29_0233FB1C bl ov29_0233785C bl ov29_0233665C - bl ov29_02304B64 + bl DetermineAllMonsterShadow bl UpdateMinimap bl UpdateTrapsVisibility ldr r1, _0231EDD4 ; =0x00000DFE diff --git a/asm/overlay_29_0231F594.s b/asm/overlay_29_0231F594.s index a6999228..a99e0709 100644 --- a/asm/overlay_29_0231F594.s +++ b/asm/overlay_29_0231F594.s @@ -94,7 +94,7 @@ _0231F6B4: mov r1, #1 ldr r0, [r0] strb r1, [r0, #0x78f] - bl ov29_02304B64 + bl DetermineAllMonsterShadow bl UpdateMinimap bl UpdateTrapsVisibility ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc} diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 7927c69e..206ec356 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -101,7 +101,7 @@ _02321584: bl IsFloorOver cmp r0, #0 bne _02321888 - bl ov29_022ED868 + bl AreLateGameTrapsEnabledWrapper cmp r0, #0 bne _023215D8 ldrh r0, [r4, #4] diff --git a/asm/overlay_29_0232A3FC.s b/asm/overlay_29_0232A3FC.s index 1d11c0f7..75df04c6 100644 --- a/asm/overlay_29_0232A3FC.s +++ b/asm/overlay_29_0232A3FC.s @@ -1564,7 +1564,7 @@ DoMoveSpikes: ; 0x0232B6C8 cmp r0, #0 movne r5, #2 moveq r5, #1 - bl ov29_022ED868 + bl AreLateGameTrapsEnabledWrapper cmp r0, #0 beq _0232B718 mov r2, r5 diff --git a/asm/overlay_29_0232C524.s b/asm/overlay_29_0232C524.s index 4a99f565..98cfebb0 100644 --- a/asm/overlay_29_0232C524.s +++ b/asm/overlay_29_0232C524.s @@ -946,7 +946,7 @@ _0232D038: cmp r4, #1 ble _0232D034 mov r4, #1 - bl ov29_02304B64 + bl DetermineAllMonsterShadow _0232D06C: mov r8, #0 mov r5, r8 @@ -1000,7 +1000,7 @@ DoMoveTrapper: ; 0x0232D0F0 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 - bl ov29_022ED868 + bl AreLateGameTrapsEnabledWrapper cmp r0, #0 bne _0232D11C #ifdef JAPAN @@ -1718,7 +1718,7 @@ DoMoveStealthRock: ; 0x0232D90C cmp r0, #0 movne r5, #2 moveq r5, #1 - bl ov29_022ED868 + bl AreLateGameTrapsEnabledWrapper cmp r0, #0 beq _0232D95C mov r2, r5 @@ -2018,7 +2018,7 @@ DoMoveToxicSpikes: ; 0x0232DC64 cmp r0, #0 movne r5, #2 moveq r5, #1 - bl ov29_022ED868 + bl AreLateGameTrapsEnabledWrapper cmp r0, #0 beq _0232DCB4 mov r2, r5 diff --git a/asm/overlay_29_023350FC.s b/asm/overlay_29_023350FC.s index 7e7f3876..71725f56 100644 --- a/asm/overlay_29_023350FC.s +++ b/asm/overlay_29_023350FC.s @@ -144,7 +144,7 @@ _023352C0: mov r0, sl bl ov29_02304830 mov r0, sl - bl ov29_02304BAC + bl DetermineMonsterShadow mov r5, #1 b _02335420 _023352FC: @@ -3843,7 +3843,7 @@ _02337C5C: cmp r0, #0 beq _02337C84 mov r0, r7 - bl ov29_02304BAC + bl DetermineMonsterShadow _02337C84: add r6, r6, #1 cmp r6, #0x14 diff --git a/asm/overlay_29_02337CCC.s b/asm/overlay_29_02337CCC.s index 79015e83..b991e283 100644 --- a/asm/overlay_29_02337CCC.s +++ b/asm/overlay_29_02337CCC.s @@ -98,7 +98,7 @@ _02337DE4: cmp r0, #0 beq _02337E0C mov r0, r6 - bl ov29_02304BAC + bl DetermineMonsterShadow _02337E0C: add r5, r5, #1 cmp r5, #0x14 diff --git a/asm/overlay_29_023498A0.s b/asm/overlay_29_023498A0.s index 1ab5e608..e027d5d2 100644 --- a/asm/overlay_29_023498A0.s +++ b/asm/overlay_29_023498A0.s @@ -4696,7 +4696,7 @@ _0234D334: bl FixedRoomIsSubstituteRoom cmp r0, #0 beq _0234D3BC - bl ov29_022F99EC + bl GetRandomExplorerMazeMonster cmp r0, #0 moveq r1, #0 beq _0234D38C