Synced from pmdsky-debug

2026-09-13 05:47:34 -05:00 · 2026-09-06 23:42:12 -04:00
parent f14ee2c91c
commit 8a05f6dac5
61 changed files with 211 additions and 211 deletions
--- a/asm/include/overlay_11_022EE5E4.inc
+++ b/asm/include/overlay_11_022EE5E4.inc
@@ -48,7 +48,6 @@
 .public ov10_022BDA84
 .public ov10_022BDB80
 .public ov10_022BDC0C
-.public ov10_022BDE50
 .public ov10_022BF00C
 .public ov10_022BF274
 .public ov10_022BF2E4
@@ -296,5 +295,6 @@
 .public sub_0206B9DC
 .public sub_0206BA5C
 .public SwitchAnimationControlToNextFrame
+.public TerminateEffectWrapper
 .public UnlockRoutine
 .public WAN_TABLE
--- a/asm/include/overlay_29_022DEBA4.inc
+++ b/asm/include/overlay_29_022DEBA4.inc
@@ -41,6 +41,7 @@
 .public GetMaxRescueAttempts
 .public GetTopScreenOption
 .public GetTurnLimit
+.public HandleShopTransaction
 .public IncrementNbSteals
 .public InitAlertBoxInfo
 .public InitDungeonRng
@@ -120,7 +121,6 @@
 .public ov29_022EF738
 .public ov29_022EF8A4
 .public ov29_022EF9B8
-.public ov29_022F62CC
 .public ov29_022F6E40
 .public ov29_022F6EF4
 .public ov29_022F7104
--- a/asm/include/overlay_29_022E6928.inc
+++ b/asm/include/overlay_29_022E6928.inc
@@ -37,7 +37,6 @@
 .public MemFree
 .public NeedsItemToSpawn
 .public ov10_022BDC68
-.public ov10_022BDE50
 .public ov10_022BEFD8
 .public ov10_022BF274
 .public ov10_022BF2B4
@@ -56,4 +55,5 @@
 .public PlayEffectAnimationEntity
 .public RandIntSafe
 .public SetMonsterId
+.public TerminateEffectWrapper
 .public UnloadFile
--- a/asm/include/overlay_29_022F2B3C.inc
+++ b/asm/include/overlay_29_022F2B3C.inc
@@ -7,9 +7,10 @@
 .public AddSimpleObjToOam
 .public AdvanceFrame
 .public BAG_ITEMS_PTR_MIRROR
+.public CanBeTalkedTo
 .public CanMonsterMoveInDirection
 .public CanMonsterMoveOrSwapWithAllyInDirection
-.public CannotStandOnTile__02300384
+.public CannotStandOnTileNoMonsterCheck
 .public ChangeMonsterAnimation
 .public CheckTeamItemsFlags
 .public DIRECTIONS_XY
@@ -36,6 +37,7 @@
 .public GetTileSafe
 .public GetTrapInfo
 .public GetTreatmentBetweenMonsters
+.public HandleShopTransaction
 .public HasHeldItem
 .public HiddenStairsTrigger
 .public IqSkillIsEnabled
@@ -55,14 +57,12 @@
 .public ov29_022E81F8
 .public ov29_022EB568
 .public ov29_022EB594
-.public ov29_022F62CC
 .public ov29_022F670C
 .public ov29_022F89AC
 .public ov29_022F9C34
 .public ov29_022F9EA0
 .public ov29_022FB920
 .public ov29_022FFA94
-.public ov29_023009CC
 .public ov29_02300FCC
 .public ov29_02321164
 .public ov29_02337D68
--- a/asm/include/overlay_29_022F52CC.inc
+++ b/asm/include/overlay_29_022F52CC.inc
@@ -8,6 +8,7 @@
 .public DungeonRandInt
 .public EntityIsValid__022F528C
 .public ExclusiveItemEffectFlagTest
+.public GetCurvedProjectileTargetPos
 .public GetItemCategoryVeneer
 .public GetItemToUse
 .public GetMessageLogPreprocessorArgs
@@ -19,14 +20,13 @@
 .public LogItemBlockedByEmbargo
 .public LogMessageByIdWithPopupCheckUser
 .public MonsterHasEmbargoStatus
-.public ov29_022E5728
-.public ov29_022E9A9C
 .public ov29_022EA370
 .public ov29_022EB378
 .public ov29_022F3B8C
 .public ov29_0230F9A4
 .public ov29_02346FB8
 .public ov29_02347000
+.public PlayItemThrowSfx
 .public PlaySeByIdIfShouldDisplayEntity
 .public PrepareItemForPrinting__02345728
 .public PrepareItemForPrinting__02345754
--- a/asm/include/overlay_29_022F59C4.inc
+++ b/asm/include/overlay_29_022F59C4.inc
@@ -2,6 +2,7 @@
 .public _s32_div_f
 .public AllocateTemp1024ByteBufferFromPool
 .public AreMovesEnabled
+.public CanBeTalkedTo
 .public CheckTeamMemberIdxVeneer
 .public CheckVariousStatuses2__02301244
 .public DIRECTIONS_XY
@@ -40,7 +41,6 @@
 .public ov29_022E81F8
 .public ov29_022F3B8C
 .public ov29_022F6748
-.public ov29_023009CC
 .public ov29_0231AE3C
 .public ov29_02322374
 .public ov29_0233A248
--- a/asm/include/overlay_29_022F62CC.inc
+++ b/asm/include/overlay_29_022F62CC.inc
@@ -5,6 +5,8 @@
 .public AnimationDelayOrSomething
 .public BAG_ITEMS_PTR_MIRROR
 .public CalcSpeedStageWrapper
+.public CanBeTalkedTo
+.public CannotMoveToTile
 .public ChangeMonsterAnimationToIdle
 .public DeleteWanTableEntryVeneer
 .public DisplayMessage2
@@ -19,6 +21,7 @@
 .public GetLeader
 .public GetMoneyCarried
 .public GetMonsterIdFromSpawnEntry
+.public GetShopkeeperIfTalkable
 .public GetSpriteFileSize
 .public GetTile
 .public GetTileAtEntity
@@ -34,15 +37,12 @@
 .public LoadMonsterSprite
 .public LoadWanTableEntryFromPackUseProvidedMemory
 .public LogMessageByIdWithPopupCheckUser
+.public MakeMonsterIdleInDirectionIfValid
 .public MemAlloc
 .public MemFree
 .public MemZero
 .public ov10_022C473C
 .public ov10_022C4800
-.public ov29_022F6210
-.public ov29_022FF764
-.public ov29_023009CC
-.public ov29_02304A00
 .public ov29_0231B490
 .public ov29_0231B4AC
 .public ov29_02352760
--- a/asm/include/overlay_29_022FE4BC.inc
+++ b/asm/include/overlay_29_022FE4BC.inc
@@ -5,7 +5,7 @@
 .public AiUseMove
 .public AnimationDelayOrSomething
 .public CanMonsterMoveInDirection
-.public CannotStandOnTile__023006C8
+.public CannotStandOnTile
 .public DIRECTIONS_XY
 .public DisplayActions
 .public DUNGEON_PTR
--- a/asm/include/overlay_29_02302A5C.inc
+++ b/asm/include/overlay_29_02302A5C.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public AddSimpleObjToOam
 .public AllocateTemp1024ByteBufferFromPool
+.public CanBeTalkedTo
 .public ChangeMonsterAnimation
 .public CopyStatusIconFlags
 .public DIRECTIONS_XY
@@ -55,7 +56,6 @@
 .public ov29_022EAC9C
 .public ov29_022EBCE8
 .public ov29_022ECB38
-.public ov29_023009CC
 .public ov29_02304830
 .public ov29_0234B4E0
 .public ov29_0234CFA0
--- a/asm/include/overlay_29_023047DC.inc
+++ b/asm/include/overlay_29_023047DC.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public _s32_div_f
 .public ActivateEndOfTurnEffects
+.public ActivateTerrainEffects
 .public AdvanceFrame
 .public CheckLeaderTile
 .public CheckNonLeaderTile
@@ -17,6 +18,7 @@
 .public GetShadowSize
 .public GetSpeedOption
 .public GetTileAtEntity
+.public HandleShopTransaction
 .public IncrementEntityPixelPosXY
 .public IsFloorOver
 .public IsFloorOver2
@@ -24,8 +26,6 @@
 .public ov29_022E8104
 .public ov29_022EA370
 .public ov29_022EF9BC
-.public ov29_022F62CC
-.public ov29_022F9C74
 .public ov29_02305814
 .public ov29_02307DD0
 .public ov29_02346888
--- a/asm/include/overlay_29_02305C28.inc
+++ b/asm/include/overlay_29_02305C28.inc
@@ -15,6 +15,7 @@
 .public GetIdleAnimationId
 .public GetMonsterApparentId
 .public GetType
+.public HandleShopTransaction
 .public IsProtectedFromNegativeStatus
 .public ItemIsActive__02307F1C
 .public LogMessageByIdWithPopupCheckUser
@@ -26,7 +27,6 @@
 .public ov29_022E543C
 .public ov29_022E65F4
 .public ov29_022E6798
-.public ov29_022F62CC
 .public ov29_022FA1D8
 .public ov29_022FB984
 .public ov29_02304830
--- a/asm/include/overlay_29_02308FE0.inc
+++ b/asm/include/overlay_29_02308FE0.inc
@@ -49,7 +49,6 @@
 .public MoveMonsterToPos
 .public MusicTableIdxToMusicId
 .public ov10_022BDC68
-.public ov10_022BDE50
 .public ov10_022BF964
 .public ov10_022C45C4
 .public ov10_022C45FC
@@ -107,6 +106,7 @@
 .public SubInitMonster
 .public SubstitutePlaceholderStringTags
 .public TalkToSecretBazaarNpcStandard
+.public TerminateEffectWrapper
 .public TryEndPetrifiedOrSleepStatus
 .public TryIncreaseHp
 .public TryRecruit
--- a/asm/include/overlay_29_0230AD04.inc
+++ b/asm/include/overlay_29_0230AD04.inc
@@ -11,8 +11,8 @@
 .public ExclusiveItemEffectIsActive__0230A9B8
 .public FixedPoint32To64
 .public FixedPoint64IsZero
-.public GetApparentWeather
 .public FlashFireShouldActivate
+.public GetApparentWeather
 .public GetTypeMatchup
 .public GhostImmunityIsActive
 .public IntToFixedPoint64
--- a/asm/include/overlay_29_0230BBAC.inc
+++ b/asm/include/overlay_29_0230BBAC.inc
@@ -40,12 +40,12 @@
 .public FixedPoint64CmpLt
 .public FixedPoint64ToInt
 .public FixedRoomIsSubstituteRoom
+.public FlashFireShouldActivate
 .public GendersEqualNotGenderless
 .public GendersNotEqualNotGenderless
 .public GenerateStandardItem
 .public GetApparentWeather
 .public GetEquivItemIndex
-.public FlashFireShouldActivate
 .public GetItemAtIdx
 .public GetMonsterGenderVeneer
 .public GetMoveCategory
@@ -69,7 +69,6 @@
 .public NearbyAllyIqSkillIsEnabled
 .public OFFENSIVE_STAT_STAGE_MULTIPLIERS
 .public OtherMonsterAbilityIsActive
-.public ov10_022BDE50
 .public ov10_022BF964
 .public ov10_022C45B4
 .public ov29_02352838
@@ -94,6 +93,7 @@
 .public SPECIAL_BAND_STAT_BOOST
 .public SubstitutePlaceholderStringTags
 .public SUPER_LUCK_CRIT_RATE_BOOST
+.public TerminateEffectWrapper
 .public TYPE_ADVANTAGE_MASTER_CRIT_RATE
 .public TYPE_MATCHUP_COMBINATOR_TABLE
 .public UpdateStateFlags
--- a/asm/include/overlay_29_0231EA04.inc
+++ b/asm/include/overlay_29_0231EA04.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public ActivateTerrainEffects
 .public DetermineAllMonsterShadow
 .public DetermineTileWalkableNeighbors
 .public DUNGEON_PTR
@@ -12,7 +13,6 @@
 .public IsFullFloorFixedRoom
 .public LogMessageByIdWithPopupCheckUser
 .public ov29_022EA370
-.public ov29_022F9C74
 .public ov29_02305814
 .public ov29_0233665C
 .public ov29_0233785C
--- a/asm/include/overlay_29_0231EDFC.inc
+++ b/asm/include/overlay_29_0231EDFC.inc
@@ -3,6 +3,7 @@
 .public AbilityIsActiveVeneer
 .public AdvanceFrame
 .public CalcDamageFixedNoCategory
+.public CannotMoveToTile
 .public CanSeeTarget
 .public ChangeMonsterAnimation
 .public ChangeMonsterAnimationToIdle
@@ -21,7 +22,6 @@
 .public MoveMonsterToPos
 .public ov29_022E9298
 .public ov29_022EA370
-.public ov29_022FF764
 .public ov29_0232033C
 .public ov29_02321238
 .public PlaySeByIdIfNotSilence
--- a/asm/include/overlay_29_0231F594.inc
+++ b/asm/include/overlay_29_0231F594.inc
@@ -14,12 +14,12 @@
 .public GetItemInfo
 .public GetTile
 .public GetTileSafe
+.public HandleShopTransaction
 .public IncrementEntityPixelPosXY
 .public IsWaterTileset
 .public LogMessageByIdWithPopupCheckUser
 .public MemAlloc
 .public MemFree
-.public ov29_022F62CC
 .public ov29_02336694
 .public PlaySeByIdIfShouldDisplayEntity
 .public RemoveGroundItem
--- a/asm/include/overlay_29_0231FC20.inc
+++ b/asm/include/overlay_29_0231FC20.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public AbilityIsActiveVeneer
+.public ActivateTerrainEffects
 .public AdvanceFrame
 .public AreTileJumpsAllowed
 .public CalcDamageFixedNoCategory
@@ -15,7 +16,6 @@
 .public LogMessageByIdWithPopupCheckUserTarget
 .public MoveMonsterToPos
 .public ov10_022C4570
-.public ov29_022F9C74
 .public ov29_022FFB90
 .public ov29_0232033C
 .public ov29_02321238
--- a/asm/include/overlay_29_023201A0.inc
+++ b/asm/include/overlay_29_023201A0.inc
@@ -2,13 +2,16 @@
 .public _s32_div_f
 .public AbilityIsActiveVeneer
 .public abs
+.public ActivateTerrainEffects
 .public AdvanceFrame
+.public CalcExplosionDamage
 .public DetermineTileWalkableNeighbors
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
 .public EnsureCanStandCurrentTile
 .public EntityIsValid__0232017C
 .public EntityIsValid__02320764
+.public EXPLOSION_FIXED_DAMAGES
 .public GetApparentWeather
 .public GetTile
 .public GetTileSafe
@@ -19,13 +22,10 @@
 .public MoveMonsterToPos
 .public ov29_022E5560
 .public ov29_022E55F0
-.public ov29_022F9C74
 .public ov29_022FFB90
-.public ov29_02320AA4
 .public ov29_02321238
 .public ov29_02336694
 .public ov29_023529B8
-.public ov29_02353700
 .public PlaySeByIdIfShouldDisplayEntity
 .public RemoveGroundItem
 .public ShouldDisplayEntityWrapper
--- a/asm/include/overlay_29_02320788.inc
+++ b/asm/include/overlay_29_02320788.inc
@@ -1,10 +1,11 @@
 #pragma once
 .public AbilityIsActiveVeneer
+.public ActivateTerrainEffects
 .public AdvanceFrame
 .public AreTileJumpsAllowed
 .public CalcDamageFixedNoCategory
-.public CannotStandOnTile__02300384
-.public CannotStandOnTile__023006C8
+.public CannotStandOnTile
+.public CannotStandOnTileNoMonsterCheck
 .public ChangeMonsterAnimationToIdle
 .public DetermineTileWalkableNeighbors
 .public DiscoverMinimap
@@ -12,12 +13,14 @@
 .public DUNGEON_PTR
 .public EntityIsValid__02320764
 .public ExclusiveItemEffectIsActiveWithLogging
+.public EXPLOSION_FIXED_DAMAGES
 .public FindClosestUnoccupiedTileWithin2
 .public FindUnoccupiedTileWithin3
 .public GetApparentWeather
 .public GetLeader
 .public GetRandomTile
 .public GetTileSafe
+.public HandleShopTransaction
 .public InitMove
 .public IsFloorOver
 .public LogMessageByIdWithPopupCheckUserTarget
@@ -27,13 +30,10 @@
 .public ov29_022E55F0
 .public ov29_022E5650
 .public ov29_022F42F8
-.public ov29_022F62CC
-.public ov29_022F9C74
 .public ov29_02305814
 .public ov29_02321238
 .public ov29_02336694
 .public ov29_023529B8
-.public ov29_02353700
 .public RemoveGroundItem
 .public ShouldDisplayEntityWrapper
 .public sub_01FFB62C
--- a/asm/include/overlay_29_02322DDC.inc
+++ b/asm/include/overlay_29_02322DDC.inc
@@ -23,7 +23,6 @@
 .public IsChargingTwoTurnMove
 .public LogMessageQuiet
 .public LogMessageWithPopup
-.public ov10_022BDE50
 .public ov10_022BE9E8
 .public ov10_022BEB2C
 .public ov10_022BF01C
@@ -45,4 +44,5 @@
 .public ShouldDisplayEntityWrapper
 .public ShouldTreatMonsterAsAlly
 .public SinAbs4096
+.public TerminateEffectWrapper
 .public TwoTurnMoveForcedMiss
--- a/asm/include/overlay_29_0232393C.inc
+++ b/asm/include/overlay_29_0232393C.inc
@@ -27,7 +27,6 @@
 .public MALE_ACCURACY_STAGE_MULTIPLIERS
 .public MALE_EVASION_STAGE_MULTIPLIERS
 .public MoveIsNotPhysical
-.public ov10_022BDE50
 .public ov10_022BEB2C
 .public ov29_022E2CA0
 .public ov29_022EA370
@@ -42,4 +41,5 @@
 .public PositionHasMonster
 .public QUICK_DODGER_MOVE_ACCURACY_DROP
 .public SinAbs4096
+.public TerminateEffectWrapper
 .public TwoTurnMoveForcedMiss
--- a/asm/include/overlay_29_0232692C.inc
+++ b/asm/include/overlay_29_0232692C.inc
@@ -8,8 +8,8 @@
 .public DungeonRandOutcomeUserAction
 .public DungeonRandOutcomeUserTargetInteraction
 .public EndFrozenStatus
-.public GetDamageSourceWrapper
 .public FlashFireShouldActivate
+.public GetDamageSourceWrapper
 .public GetMoveCategory
 .public GetMoveType
 .public LogMessageByIdWithPopupCheckUserTarget
--- a/asm/include/overlay_29_0232E864.inc
+++ b/asm/include/overlay_29_0232E864.inc
@@ -1,9 +1,11 @@
 #pragma once
 .public AbilityIsActiveVeneer
+.public ACID_PSYCHIC_LOWER_DEFENSE_CHANCE
 .public AnimationDelayOrSomething
 .public ApplyDamageAndEffectsWrapper
 .public AreEntitiesAdjacent
 .public ATK_STAT_IDX
+.public BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE
 .public CalcDamage
 .public CanBeSnatched
 .public CanHitWithRegularAttack
@@ -332,8 +334,10 @@
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public DungeonRandOutcomeUserAction
+.public EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE
 .public EntityIsValid__0232E840
 .public ExclusiveItemEffectIsActive__023329E8
+.public FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE
 .public FOREWARN_FORCED_MISS_CHANCE
 .public GetDamageSourceWrapper
 .public GetDirectionTowardsPosition
@@ -366,12 +370,7 @@
 .public MonsterCannotAttack
 .public MoveHitCheck
 .public ov10_022BFD6C
-.public EARTH_POWER_LOWER_SPECIAL_DEFENSE_CHANCE
-.public SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE
-.public FLASH_CANNON_LOWER_SPECIAL_DEFENSE_CHANCE
 .public ov10_022C45F8
-.public ACID_PSYCHIC_LOWER_DEFENSE_CHANCE
-.public BUG_BUZZ_LOWER_SPECIAL_DEFENSE_CHANCE
 .public ov10_022C483C
 .public ov29_022E3FCC
 .public ov29_022E4110
@@ -401,6 +400,7 @@
 .public PlaySeByIdIfShouldDisplayEntity
 .public PrepareItemForPrinting__02345728
 .public ROLLOUT_ICE_BALL_MISSED
+.public SEED_FLARE_LOWER_SPECIAL_DEFENSE_CHANCE
 .public SetPreprocessorArgsStringToName
 .public ShouldDisplayEntityWrapper
 .public SPATK_STAT_IDX
--- a/asm/include/overlay_29_02336450.inc
+++ b/asm/include/overlay_29_02336450.inc
@@ -1,5 +1,5 @@
 #pragma once
-.public CannotStandOnTile__02300384
+.public CannotStandOnTileNoMonsterCheck
 .public CanSeePosition
 .public Debug_Print0
 .public DEFAULT_TILE
--- a/asm/include/overlay_29_02348020.inc
+++ b/asm/include/overlay_29_02348020.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public _020A1878
 .public AdvanceFrame
+.public CanBeTalkedTo
 .public CanSeeTarget
 .public ClearMissionDestinationInfo
 .public DisplayMessage
@@ -36,7 +37,6 @@
 .public ov29_022E0DFC
 .public ov29_022E0E44
 .public ov29_022FB9BC
-.public ov29_023009CC
 .public ov29_02344B9C
 .public ov29_023497C8
 .public ov29_02349818
--- a/asm/include/overlay_29_023498A0.inc
+++ b/asm/include/overlay_29_023498A0.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public AdvanceFrame
 .public BAG_ITEMS_PTR_MIRROR
+.public CanBeTalkedTo
 .public CanSeeTarget
 .public ChangeDungeonMusic
 .public DisplayMessage
@@ -47,7 +48,6 @@
 .public ov29_022E8244
 .public ov29_022EAEFC
 .public ov29_022FA3D4
-.public ov29_023009CC
 .public ov29_02344B9C
 .public ov29_02348888
 .public ov29_023491B8
--- a/asm/overlay_10_022BCDF4.s
+++ b/asm/overlay_10_022BCDF4.s
@@ -1055,8 +1055,8 @@ ov10_022BDBB0: ; 0x022BDBB0
 _022BDBC4: .word ov10_022DC1C0
 	arm_func_end ov10_022BDBB0

-	arm_func_start ov10_022BDBC8
-ov10_022BDBC8: ; 0x022BDBC8
+	arm_func_start TerminateAllEffects
+TerminateAllEffects: ; 0x022BDBC8
 	stmdb sp!, {r4, r5, r6, lr}
 	ldr r0, _022BDC08 ; =ov10_022DC1C0
 	mov r6, #0
@@ -1068,7 +1068,7 @@ _022BDBDC:
 	beq _022BDBF4
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _022BDBF4:
 	add r6, r6, #1
 	cmp r6, #0x20
@@ -1077,12 +1077,12 @@ _022BDBF4:
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _022BDC08: .word ov10_022DC1C0
-	arm_func_end ov10_022BDBC8
+	arm_func_end TerminateAllEffects

 	arm_func_start ov10_022BDC0C
 ov10_022BDC0C: ; 0x022BDC0C
 	stmdb sp!, {r3, lr}
-	bl ov10_022BDBC8
+	bl TerminateAllEffects
 	ldr r0, _022BDC60 ; =ov10_022DC1C0
 	ldr r1, _022BDC64 ; =WAN_TABLE
 	ldr r2, [r0]
@@ -1111,7 +1111,7 @@ _022BDC64: .word WAN_TABLE
 	arm_func_start ov10_022BDC68
 ov10_022BDC68: ; 0x022BDC68
 	stmdb sp!, {r3, lr}
-	bl ov10_022BDBC8
+	bl TerminateAllEffects
 	ldr r0, _022BDCA0 ; =ov10_022DC1C0
 	mov r2, #0
 	ldr r1, [r0]
@@ -1139,11 +1139,11 @@ ov10_022BDCA4: ; 0x022BDCA4
 	bx lr
 	arm_func_end ov10_022BDCA4

-	arm_func_start ov10_022BDCBC
-ov10_022BDCBC: ; 0x022BDCBC
+	arm_func_start TerminateEffect
+TerminateEffect: ; 0x022BDCBC
 	stmdb sp!, {r4, r5, r6, lr}
 	mov r5, r1
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	ldmeqia sp!, {r4, r5, r6, pc}
@@ -1251,13 +1251,13 @@ _022BDE34:
 _022BDE44: .word ov10_022DC1C0
 _022BDE48: .word ov10_022C79D8
 _022BDE4C: .word ov10_022C7A18
-	arm_func_end ov10_022BDCBC
+	arm_func_end TerminateEffect

-	arm_func_start ov10_022BDE50
-ov10_022BDE50: ; 0x022BDE50
+	arm_func_start TerminateEffectWrapper
+TerminateEffectWrapper: ; 0x022BDE50
 	stmdb sp!, {r4, lr}
 	mov r4, r0
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r2, #0
 	cmp r0, r2
 	ldmeqia sp!, {r4, pc}
@@ -1274,15 +1274,15 @@ ov10_022BDE50: ; 0x022BDE50
 	mov r0, r4
 	bhi _022BDEA4
 	mov r1, #0
-	bl ov10_022BDCBC
+	bl TerminateEffect
 	ldmia sp!, {r4, pc}
 _022BDEA4:
 	mov r1, #1
-	bl ov10_022BDCBC
+	bl TerminateEffect
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _022BDEB0: .word ov10_022DC1C0
-	arm_func_end ov10_022BDE50
+	arm_func_end TerminateEffectWrapper

 	arm_func_start GetEffectAnimationWanOffset
 GetEffectAnimationWanOffset: ; 0x022BDEB4
@@ -1369,8 +1369,8 @@ _022BDFB4:
 _022BDFBC: .word ov10_022DC1C0
 	arm_func_end ov10_022BDF34

-	arm_func_start ov10_022BDFC0
-ov10_022BDFC0: ; 0x022BDFC0
+	arm_func_start PlayEffect
+PlayEffect: ; 0x022BDFC0
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	sub sp, sp, #0x10
 	mov r7, r0
@@ -1683,7 +1683,7 @@ _022BE440:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _022BE448: .word ov10_022DC1C0
-	arm_func_end ov10_022BDFC0
+	arm_func_end PlayEffect

 	arm_func_start ov10_022BE44C
 ov10_022BE44C: ; 0x022BE44C
@@ -1901,14 +1901,14 @@ ov10_022BE730: ; 0x022BE730
 	ldmeqia sp!, {r4, pc}
 	mov r0, r4, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mov r1, #0x13c
 	ldr r2, _022BE77C ; =ov10_022DC1C0
 	mul r3, r0, r1
 	ldr r0, [r2]
 	ldr r1, [r0, r3]
 	add r0, r0, r3
-	bl ov10_022BDFC0
+	bl PlayEffect
 	mov r0, r4, lsl #0x10
 	mov r0, r0, asr #0x10
 	ldmia sp!, {r4, pc}
@@ -2068,8 +2068,8 @@ _022BE998: .word ov10_022DC1C0
 _022BE99C: .word 0x00000287
 	arm_func_end ov10_022BE780

-	arm_func_start ov10_022BE9A0
-ov10_022BE9A0: ; 0x022BE9A0
+	arm_func_start GetLiveEffectIdx
+GetLiveEffectIdx: ; 0x022BE9A0
 	mvn r1, #0
 	cmp r0, r1
 	beq _022BE9DC
@@ -2092,7 +2092,7 @@ _022BE9DC:
 	bx lr
 	.align 2, 0
 _022BE9E4: .word ov10_022DC1C0
-	arm_func_end ov10_022BE9A0
+	arm_func_end GetLiveEffectIdx

 	arm_func_start ov10_022BE9E8
 ov10_022BE9E8: ; 0x022BE9E8
@@ -2148,7 +2148,7 @@ _022BEA78:
 	beq _022BEB18
 	mov r0, r4, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	moveq r0, r1
@@ -2188,7 +2188,7 @@ ov10_022BEB2C: ; 0x022BEB2C
 	stmdb sp!, {r4, r5, r6, lr}
 	mov r6, r1
 	mov r5, r2
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	ldmeqia sp!, {r4, r5, r6, pc}
@@ -2445,7 +2445,7 @@ _022BEEA0:
 	mov r4, r0
 	mov r0, r4, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	beq _022BEEFC
@@ -2522,7 +2522,7 @@ _022BEFD4: .word ov10_022C7954
 	arm_func_start ov10_022BEFD8
 ov10_022BEFD8: ; 0x022BEFD8
 	stmdb sp!, {r3, lr}
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	beq _022BF000
@@ -2784,7 +2784,7 @@ ov10_022BF314: ; 0x022BF314
 	cmp r0, r1
 	moveq r0, #0
 	ldmeqia sp!, {r3, pc}
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	ldr r2, _022BF358 ; =ov10_022DC1C0
 	mov r1, #0x13c
 	ldr r2, [r2]
@@ -2815,7 +2815,7 @@ ov10_022BF35C: ; 0x022BF35C
 	ldmia sp!, {r4, pc}
 _022BF388:
 	ldr r1, [r0]
-	bl ov10_022BDFC0
+	bl PlayEffect
 	ldmia sp!, {r4, pc}
 	arm_func_end ov10_022BF35C

@@ -2889,7 +2889,7 @@ ov10_022BF45C: ; 0x022BF45C
 	mov r6, r1
 	mov r5, r2
 	mov r4, r3
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	ldmeqia sp!, {r4, r5, r6, pc}
@@ -2926,8 +2926,8 @@ _022BF4E8: .word ov10_022DC1C0
 _022BF4EC: .word 0x0000FFFF
 	arm_func_end ov10_022BF45C

-	arm_func_start ov10_022BF4F0
-ov10_022BF4F0: ; 0x022BF4F0
+	arm_func_start DisplayEffect
+DisplayEffect: ; 0x022BF4F0
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r6, r0
 	ldr r3, [r6, #0xc]
@@ -2964,14 +2964,14 @@ _022BF53C:
 	mov r1, #1
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDCBC
+	bl TerminateEffect
 	b _022BF6D4
 _022BF580:
 	ldr r0, [r6, #0xc]
 	mov r1, #0
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDCBC
+	bl TerminateEffect
 	b _022BF6D4
 _022BF598:
 	add r0, r6, #0x68
@@ -3098,7 +3098,7 @@ _022BF750:
 _022BF758: .word ov10_022C7870
 _022BF75C: .word 0x0000FFFF
 _022BF760: .word ov10_022DC1C0
-	arm_func_end ov10_022BF4F0
+	arm_func_end DisplayEffect

 	arm_func_start ov10_022BF764
 ov10_022BF764: ; 0x022BF764
@@ -3122,7 +3122,7 @@ ov10_022BF764: ; 0x022BF764
 _022BF7A8:
 	mov r0, r6
 	mov r1, r4
-	bl ov10_022BF4F0
+	bl DisplayEffect
 	add r5, r5, #1
 	cmp r5, #0x20
 	add r6, r6, #0x13c
@@ -3169,7 +3169,7 @@ _022BF824:
 	beq _022BF844
 	mov r0, r5
 	mov r1, r6
-	bl ov10_022BF4F0
+	bl DisplayEffect
 	mov r4, r0
 _022BF844:
 	add r7, r7, #1
@@ -3209,7 +3209,7 @@ _022BF8A8:
 	beq _022BF8C8
 	mov r0, r5
 	mov r1, r6
-	bl ov10_022BF4F0
+	bl DisplayEffect
 	mov r4, r0
 _022BF8C8:
 	add r7, r7, #1
@@ -3270,7 +3270,7 @@ _022BF960: .word ov10_022DC1C0
 	arm_func_start ov10_022BF964
 ov10_022BF964: ; 0x022BF964
 	stmdb sp!, {r3, lr}
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	beq _022BF9C0
@@ -3432,7 +3432,7 @@ ov10_022BFB6C: ; 0x022BFB6C
 	mov r6, r1
 	mov r5, r2
 	mov r4, r3
-	bl ov10_022BE9A0
+	bl GetLiveEffectIdx
 	mvn r1, #0
 	cmp r0, r1
 	beq _022BFC4C
--- a/asm/overlay_11_022EE5E4.s
+++ b/asm/overlay_11_022EE5E4.s
@@ -7533,7 +7533,7 @@ _022F4400:
 	ldr r0, [r0, #0x328]
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _022F4430:
 	ldr r5, _022F447C ; =ov11_02324CE0
 	ldr r0, [r5, #4]
@@ -8164,7 +8164,7 @@ ov11_022F4BE4: ; 0x022F4BE4
 	cmpne r1, r0
 	beq _022F4C14
 	ldrsh r0, [r4, #0xa2]
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _022F4C14:
 	ldrh r0, [r4, #0x90]
 	tst r0, #0x4000
@@ -8812,7 +8812,7 @@ ov11_022F5460: ; 0x022F5460
 	cmp r1, r0
 	beq _022F54D4
 	ldrsh r0, [r5, #0xa2]
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 	mvn r0, #0
 	strh r0, [r5, #0xa2]
 _022F54D4:
--- a/asm/overlay_29_022DEBA4.s
+++ b/asm/overlay_29_022DEBA4.s
@@ -943,7 +943,7 @@ _022DF8E4:
 	beq _022DF90C
 	bl TryActivateArtificialWeatherAbilities
 	mov r0, #1
-	bl ov29_022F62CC
+	bl HandleShopTransaction
 	b _022DF9B0
 _022DF90C:
 	bl DisplayFloorTip
--- a/asm/overlay_29_022E5650.s
+++ b/asm/overlay_29_022E5650.s
@@ -76,8 +76,8 @@ _022E5710:
 	ldmia sp!, {r4, pc}
 	arm_func_end ov29_022E56F4

-	arm_func_start ov29_022E5728
-ov29_022E5728: ; 0x022E5728
+	arm_func_start PlayItemThrowSfx
+PlayItemThrowSfx: ; 0x022E5728
 	stmdb sp!, {r3, lr}
 	cmp r1, #0
 	bne _022E5740
@@ -98,7 +98,7 @@ _022E5754:
 _022E5760: .word 0x0000130E
 _022E5764: .word 0x0000130D
 _022E5768: .word 0x0000130C
-	arm_func_end ov29_022E5728
+	arm_func_end PlayItemThrowSfx

 	arm_func_start PlayMissSfx__022E611C
 PlayMissSfx__022E611C: ; 0x022E576C
--- a/asm/overlay_29_022E6928.s
+++ b/asm/overlay_29_022E6928.s
@@ -58,7 +58,7 @@ _022E69E0:
 	cmp r5, #0
 	blt _022E69F0
 	mov r0, r5
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _022E69F0:
 	add sp, sp, #0x1c
 	ldmia sp!, {r3, r4, r5, r6, pc}
@@ -293,7 +293,7 @@ _022E6CFC:
 	ldr r0, [r0, #0xc]
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _022E6D30:
 	add r4, r4, #1
 _022E6D34:
--- a/asm/overlay_29_022E9A44.s
+++ b/asm/overlay_29_022E9A44.s
@@ -34,8 +34,8 @@ ov29_022E9A6C: ; 0x022E9A6C
 _022E9A98: .word 0x00007530
 	arm_func_end ov29_022E9A6C

-	arm_func_start ov29_022E9A9C
-ov29_022E9A9C: ; 0x022E9A9C
+	arm_func_start GetCurvedProjectileTargetPos
+GetCurvedProjectileTargetPos: ; 0x022E9A9C
 #ifdef JAPAN
 #define OV29_022E9A9C_OFFSET -0xA4
 #else
@@ -187,7 +187,7 @@ _022E9CA8: .word DUNGEON_PTR
 _022E9CAC: .word ov29_0235179C
 _022E9CB0: .word ov29_023517A0
 _022E9CB4: .word ov29_023517A2
-	arm_func_end ov29_022E9A9C
+	arm_func_end GetCurvedProjectileTargetPos

 	arm_func_start ov29_022E9CB8
 ov29_022E9CB8: ; 0x022E9CB8
--- a/asm/overlay_29_022F2B3C.s
+++ b/asm/overlay_29_022F2B3C.s
@@ -902,7 +902,7 @@ ov29_022F37D0: ; 0x022F37D0
 	movne r0, #0
 	ldmneia sp!, {r3, r4, r5, r6, r7, pc}
 	mov r0, r7
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r3, r4, r5, r6, r7, pc}
@@ -1101,7 +1101,7 @@ _022F3A6C:
 	ldr r1, _022F3AF8 ; =0x00000BA7
 	bl LogMessageByIdWithPopupCheckUser
 	mov r0, #0
-	bl ov29_022F62CC
+	bl HandleShopTransaction
 	mov r0, fp
 	mov r1, #0
 	strh r1, [sb, #0x68]
@@ -1142,7 +1142,7 @@ ov29_022F3AFC: ; 0x022F3AFC
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
 	mov r0, r6
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
@@ -1153,7 +1153,7 @@ ov29_022F3AFC: ; 0x022F3AFC
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
 	mov r0, r4
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
@@ -1694,7 +1694,7 @@ ov29_022F426C: ; 0x022F426C
 	ldmneia sp!, {r4, r5, r6, pc}
 	mov r0, r6
 	mov r1, r5
-	bl CannotStandOnTile__02300384
+	bl CannotStandOnTileNoMonsterCheck
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r4, r5, r6, pc}
--- a/asm/overlay_29_022F52CC.s
+++ b/asm/overlay_29_022F52CC.s
@@ -395,7 +395,7 @@ _022F57F4:
 	bl GetItemCategoryVeneer
 	mov r1, r0
 	mov r0, sb
-	bl ov29_022E5728
+	bl PlayItemThrowSfx
 	mov r0, sb
 	mov r1, #0x2e
 	bl ItemIsActive__022F5994
@@ -471,7 +471,7 @@ _022F58EC:
 	bne _022F5928
 	add r0, sp, #4
 	mov r1, sb
-	bl ov29_022E9A9C
+	bl GetCurvedProjectileTargetPos
 	add r4, sp, #8
 	add r1, sp, #0xc
 	add r3, sp, #4
--- a/asm/overlay_29_022F59C4.s
+++ b/asm/overlay_29_022F59C4.s
@@ -77,7 +77,7 @@ ov29_022F5A40: ; 0x022F5A40
 	bl DisplayMessage2
 	b _022F5D94
 _022F5A70:
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	bne _022F5A90
 #ifdef JAPAN
@@ -131,7 +131,7 @@ _022F5ADC:
 	mov r1, sl
 	bl TryEndPetrifiedOrSleepStatus
 	mov r0, sl
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	beq _022F5B4C
 	mov r0, sl
@@ -716,8 +716,8 @@ _022F6208: .word DIRECTIONS_XY
 _022F620C: .word DIRECTIONS_XY + 2
 	arm_func_end UseRegularAttackOrStruggle

-	arm_func_start ov29_022F6210
-ov29_022F6210: ; 0x022F6210
+	arm_func_start GetShopkeeperIfTalkable
+GetShopkeeperIfTalkable: ; 0x022F6210
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r6, r0
 	bl EntityIsValid__022F62A8
@@ -745,7 +745,7 @@ _022F6234:
 	cmp r0, #1
 	bne _022F6288
 	mov r0, r5
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	beq _022F6288
 	ldrb r1, [r6, #0x25]
@@ -764,4 +764,4 @@ _022F6294:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _022F62A4: .word DUNGEON_PTR
-	arm_func_end ov29_022F6210
+	arm_func_end GetShopkeeperIfTalkable
--- a/asm/overlay_29_022F62CC.s
+++ b/asm/overlay_29_022F62CC.s
@@ -3,8 +3,8 @@

 	.text

-	arm_func_start ov29_022F62CC
-ov29_022F62CC: ; 0x022F62CC
+	arm_func_start HandleShopTransaction
+HandleShopTransaction: ; 0x022F62CC
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	sub sp, sp, #0x28
 	mov sl, r0
@@ -72,7 +72,7 @@ _022F6388:
 	cmp r0, #1
 	bne _022F63D8
 	mov r0, sb
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	beq _022F63D8
 	ldrb r1, [r4, #0x25]
@@ -94,7 +94,7 @@ _022F63D8:
 	cmp r6, #0
 	beq _022F66F4
 	mov r0, r4
-	bl ov29_022F6210
+	bl GetShopkeeperIfTalkable
 	movs r5, r0
 	beq _022F6434
 	add r0, r5, #4
@@ -146,7 +146,7 @@ _022F648C:
 	cmp r0, #1
 	bne _022F6614
 	mov r0, sl
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	beq _022F6614
 	ldrb r1, [r4, #0x25]
@@ -201,7 +201,7 @@ _022F6548:
 	beq _022F65B4
 	mov r0, sl
 	add r1, sp, #0x14
-	bl ov29_022FF764
+	bl CannotMoveToTile
 	cmp r0, #0
 	bne _022F65B4
 	add r3, sp, #0x14
@@ -221,7 +221,7 @@ _022F65C4:
 	ble _022F6540
 _022F65CC:
 	mov r0, r4
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	moveq r7, #0
 	beq _022F65F8
@@ -230,7 +230,7 @@ _022F65CC:
 	bl GetDirectionTowardsPosition
 	mov r1, r0
 	mov r0, r4
-	bl ov29_02304A00
+	bl MakeMonsterIdleInDirectionIfValid
 _022F65F8:
 	add r0, sl, #4
 	add r1, r4, #4
@@ -256,7 +256,7 @@ _022F6620:
 	ldr r0, [r0, #0x7bc]
 	cmp r1, r0
 	ble _022F66F4
-	bl ov29_022F6CAC
+	bl TriggerThiefAlert
 	b _022F66F4
 _022F6654:
 	ldr r0, [sp]
@@ -270,16 +270,16 @@ _022F6654:
 	ldr r0, [r0, #0x7bc]
 	cmp r1, r0
 	ble _022F66F4
-	bl ov29_022F6CAC
+	bl TriggerThiefAlert
 	b _022F66F4
 _022F6688:
 	mov r0, r7
 	bl ov29_022F67D0
 	mov r0, r7
-	bl ov29_022F6A0C
+	bl TryBuyFromShop
 	cmp r0, #0
 	beq _022F66A8
-	bl ov29_022F6CAC
+	bl TriggerThiefAlert
 	b _022F66F4
 _022F66A8:
 	cmp fp, #1
@@ -288,7 +288,7 @@ _022F66A8:
 	cmp r6, #0
 	beq _022F66F4
 	mov r0, r4
-	bl ov29_022F6210
+	bl GetShopkeeperIfTalkable
 	movs r5, r0
 	beq _022F66E4
 	add r0, r5, #4
@@ -316,7 +316,7 @@ _022F6700: .word 0x00000E53
 _022F6704: .word ov29_02352760
 _022F6708: .word 0x00000E52
 #endif
-	arm_func_end ov29_022F62CC
+	arm_func_end HandleShopTransaction

 	arm_func_start ov29_022F670C
 ov29_022F670C: ; 0x022F670C
@@ -350,7 +350,7 @@ ov29_022F6748: ; 0x022F6748
 	mov r0, #1
 	bl ov29_022F67D0
 	mov r0, #1
-	bl ov29_022F6A0C
+	bl TryBuyFromShop
 	movs r4, r0
 	beq _022F67B4
 	bl GetLeader
@@ -366,7 +366,7 @@ ov29_022F6748: ; 0x022F6748
 	bl DisplayMessage2
 	b _022F67C4
 _022F67AC:
-	bl ov29_022F6CAC
+	bl TriggerThiefAlert
 	b _022F67C4
 _022F67B4:
 #ifdef JAPAN
@@ -555,8 +555,8 @@ _022F6A04: .word ov29_02352760
 _022F6A08: .word 0x00000E4A + OV29_022F67D0_DATA_OFFSET
 	arm_func_end ov29_022F67D0

-	arm_func_start ov29_022F6A0C
-ov29_022F6A0C: ; 0x022F6A0C
+	arm_func_start TryBuyFromShop
+TryBuyFromShop: ; 0x022F6A0C
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
 	sub sp, sp, #0x14
 	mov r5, r0
@@ -755,10 +755,10 @@ _022F6C9C: .word 0x00000E4B + OV29_022F6A0C_OFFSET
 _022F6CA0: .word 0x00001308
 _022F6CA4: .word BAG_ITEMS_PTR_MIRROR
 _022F6CA8: .word 0x00000E49 + OV29_022F6A0C_OFFSET
-	arm_func_end ov29_022F6A0C
+	arm_func_end TryBuyFromShop

-	arm_func_start ov29_022F6CAC
-ov29_022F6CAC: ; 0x022F6CAC
+	arm_func_start TriggerThiefAlert
+TriggerThiefAlert: ; 0x022F6CAC
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
 	ldr r0, _022F6E0C ; =DUNGEON_PTR
 	mov r2, #1
@@ -865,7 +865,7 @@ _022F6E10: .word 0x00000B96
 _022F6E10: .word 0x00000E54
 #endif
 _022F6E14: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end ov29_022F6CAC
+	arm_func_end TriggerThiefAlert

 	arm_func_start ResetDamageData
 ResetDamageData: ; 0x022F6E18
--- a/asm/overlay_29_022F9744.s
+++ b/asm/overlay_29_022F9744.s
@@ -445,8 +445,8 @@ IsMonsterIdInNormalRangeVeneer: ; 0x022F9C68
 _022F9C70: .word IsMonsterIdInNormalRange
 	arm_func_end IsMonsterIdInNormalRangeVeneer

-	arm_func_start ov29_022F9C74
-ov29_022F9C74: ; 0x022F9C74
+	arm_func_start ActivateTerrainEffects
+ActivateTerrainEffects: ; 0x022F9C74
 #ifdef JAPAN
 #define OV29_022F9C74_OFFSET -4
 #else
@@ -636,7 +636,7 @@ _022F9E9C: .word 0x0000095A
 _022F9E98: .word 0x00000C1A
 _022F9E9C: .word 0x00000C1B
 #endif
-	arm_func_end ov29_022F9C74
+	arm_func_end ActivateTerrainEffects

 	arm_func_start ov29_022F9EA0
 ov29_022F9EA0: ; 0x022F9EA0
--- a/asm/overlay_29_022FE4BC.s
+++ b/asm/overlay_29_022FE4BC.s
@@ -602,7 +602,7 @@ _022FF704:
 	bne _022FF794
 	mov r0, r6
 	add r1, r6, #4
-	bl CannotStandOnTile__023006C8
+	bl CannotStandOnTile
 	cmp r0, #0
 	beq _022FF784
 	ldr r0, [r5, #0x110]
@@ -1268,7 +1268,7 @@ _022FECD8:
 	bne _022FED68
 	mov r0, sb
 	add r1, sb, #4
-	bl CannotStandOnTile__023006C8
+	bl CannotStandOnTile
 	cmp r0, #0
 	beq _022FED58
 	ldr r0, [r6, #0x110 + EXECUTE_MONSTER_ACTION_OFFSET]
--- a/asm/overlay_29_022FF6C4.s
+++ b/asm/overlay_29_022FF6C4.s
@@ -53,8 +53,8 @@ _022FF75C:
 	ldmia sp!, {r4, pc}
 	arm_func_end IsInvalidSpawnTile

-	arm_func_start ov29_022FF764
-ov29_022FF764: ; 0x022FF764
+	arm_func_start CannotMoveToTile
+CannotMoveToTile: ; 0x022FF764
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r7, r1
 	mov r6, r0
@@ -171,4 +171,4 @@ _022FF888:
 _022FF890:
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
-	arm_func_end ov29_022FF764
+	arm_func_end CannotMoveToTile
--- a/asm/overlay_29_022FF958.s
+++ b/asm/overlay_29_022FF958.s
@@ -3,8 +3,8 @@

 	.text

-	arm_func_start CannotStandOnTile__02300384
-CannotStandOnTile__02300384: ; 0x022FF958
+	arm_func_start CannotStandOnTileNoMonsterCheck
+CannotStandOnTileNoMonsterCheck: ; 0x022FF958
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r7, r1
 	mov r6, r0
@@ -123,7 +123,7 @@ _022FFA84:
 _022FFA8C:
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
-	arm_func_end CannotStandOnTile__02300384
+	arm_func_end CannotStandOnTileNoMonsterCheck

 	arm_func_start ov29_022FFA94
 ov29_022FFA94: ; 0x022FFA94
@@ -294,8 +294,8 @@ _022FFC94:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	arm_func_end ov29_022FFB90

-	arm_func_start CannotStandOnTile__023006C8
-CannotStandOnTile__023006C8: ; 0x022FFC9C
+	arm_func_start CannotStandOnTile
+CannotStandOnTile: ; 0x022FFC9C
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	mov r7, r1
 	mov r6, r0
@@ -423,7 +423,7 @@ _022FFDE4:
 _022FFDEC:
 	mov r0, #1
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
-	arm_func_end CannotStandOnTile__023006C8
+	arm_func_end CannotStandOnTile

 	arm_func_start CalcSpeedStage
 CalcSpeedStage: ; 0x022FFDF4
--- a/asm/overlay_29_023009A0.s
+++ b/asm/overlay_29_023009A0.s
@@ -18,8 +18,8 @@ ov29_023009A0: ; 0x023009A0
 	ldmia sp!, {r4, pc}
 	arm_func_end ov29_023009A0

-	arm_func_start ov29_023009CC
-ov29_023009CC: ; 0x023009CC
+	arm_func_start CanBeTalkedTo
+CanBeTalkedTo: ; 0x023009CC
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	ldr r4, [r5, #0xb4]
@@ -98,7 +98,7 @@ ov29_023009CC: ; 0x023009CC
 	moveq r0, #0
 	and r0, r0, #0xff
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov29_023009CC
+	arm_func_end CanBeTalkedTo

 	arm_func_start HasStatusThatPreventsOutlawEscaping
 HasStatusThatPreventsOutlawEscaping: ; 0x02300B04
--- a/asm/overlay_29_02302A5C.s
+++ b/asm/overlay_29_02302A5C.s
@@ -207,7 +207,7 @@ ov29_02302CC8: ; 0x02302CC8
 	add r1, sp, #0x18
 	mov r0, sb
 	str r1, [r8, #0x38]
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	beq _02302DBC
 	mov r0, sb
--- a/asm/overlay_29_023047DC.s
+++ b/asm/overlay_29_023047DC.s
@@ -183,8 +183,8 @@ ov29_023049D4: ; 0x023049D4
 	ldmia sp!, {r3, pc}
 	arm_func_end ov29_023049D4

-	arm_func_start ov29_02304A00
-ov29_02304A00: ; 0x02304A00
+	arm_func_start MakeMonsterIdleInDirectionIfValid
+MakeMonsterIdleInDirectionIfValid: ; 0x02304A00
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	ldr r2, [r5]
@@ -203,7 +203,7 @@ ov29_02304A00: ; 0x02304A00
 	strltb r1, [r0, #0x4c]
 	strltb r1, [r5, #0xb0]
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov29_02304A00
+	arm_func_end MakeMonsterIdleInDirectionIfValid

 	arm_func_start ChangeMonsterAnimationToIdle
 ChangeMonsterAnimationToIdle: ; 0x02304A48
@@ -946,7 +946,7 @@ _02305430:
 	add r0, sb, #4
 	bl DiscoverMinimap
 	mov r0, fp
-	bl ov29_022F62CC
+	bl HandleShopTransaction
 	bl CheckLeaderTile
 	b _0230547C
 _0230545C:
@@ -1001,7 +1001,7 @@ _023054E4:
 	cmpeq r1, r0
 	mov r0, sb
 	strneb r7, [r4]
-	bl ov29_022F9C74
+	bl ActivateTerrainEffects
 	mov r0, sb
 	bl EnsureCanStandCurrentTile
 _0230552C:
--- a/asm/overlay_29_02305C28.s
+++ b/asm/overlay_29_02305C28.s
@@ -1194,7 +1194,7 @@ _02306ADC:
 	cmp r4, #0
 	beq _02306AFC
 	mov r0, #1
-	bl ov29_022F62CC
+	bl HandleShopTransaction
 _02306AFC:
 	cmp r7, #0
 	ldmneia sp!, {r4, r5, r6, r7, r8, pc}
--- a/asm/overlay_29_02308FE0.s
+++ b/asm/overlay_29_02308FE0.s
@@ -499,7 +499,7 @@ _0230A100:
 	cmp r0, #0
 	bne _0230A0F8
 	mov r0, r6
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 	mov r2, #0
 	str r2, [sp]
 	mov r0, #1
@@ -1603,7 +1603,7 @@ _023096D4:
 	cmp r0, #0
 	bne _023096CC
 	mov r0, sl
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 	mov r2, #0
 	str r2, [sp]
 	mov r0, #1
--- a/asm/overlay_29_0230BBAC.s
+++ b/asm/overlay_29_0230BBAC.s
@@ -2021,7 +2021,7 @@ ov29_0230D7D4: ; 0x0230D7D4
 	cmp r3, r1
 	beq _0230D808
 	ldrsh r0, [r2]
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 	ldr r0, _0230D870 ; =ov29_023535D4
 	mvn r1, #0
 	strh r1, [r0]
@@ -2051,7 +2051,7 @@ _0230D850:
 	cmp r0, #0
 	bne _0230D848
 	mov r0, r5
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _0230D868:
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, pc}
--- a/asm/overlay_29_0231EA04.s
+++ b/asm/overlay_29_0231EA04.s
@@ -268,7 +268,7 @@ _0231ED58:
 	cmp r0, #0
 	beq _0231ED98
 	mov r0, r5
-	bl ov29_022F9C74
+	bl ActivateTerrainEffects
 	mov r0, r5
 	bl EntityIsValid__0231EDD8
 	cmp r0, #0
--- a/asm/overlay_29_0231EDFC.s
+++ b/asm/overlay_29_0231EDFC.s
@@ -121,7 +121,7 @@ _0231EF64:
 	add r1, sp, #0x34
 	add r2, r3, r2
 	strh r2, [sp, #0x36]
-	bl ov29_022FF764
+	bl CannotMoveToTile
 	cmp r0, #0
 	bne _0231EFB8
 	ldrsh r0, [sp, #0x34]
@@ -162,7 +162,7 @@ _0231EFF8:
 	add r1, sp, #0x30
 	add r2, r3, r2
 	strh r2, [sp, #0x32]
-	bl ov29_022FF764
+	bl CannotMoveToTile
 	cmp r0, #0
 	bne _0231F074
 	ldrsh r0, [sp, #0x30]
@@ -229,7 +229,7 @@ _0231F0F4:
 	strh r0, [sp, #0x2e]
 	mov r0, r4
 	mov r1, r6
-	bl ov29_022FF764
+	bl CannotMoveToTile
 	cmp r0, #0
 	bne _0231F150
 	ldrsh r0, [sp, #0x2c]
@@ -413,7 +413,7 @@ _0231F3A4:
 	mov r1, sb
 	strh r3, [sp, #0x28]
 	strh r2, [sp, #0x2a]
-	bl ov29_022FF764
+	bl CannotMoveToTile
 	cmp r0, #0
 	bne _0231F408
 	ldrsh r0, [sp, #0x28]
--- a/asm/overlay_29_0231F594.s
+++ b/asm/overlay_29_0231F594.s
@@ -481,7 +481,7 @@ _0231FBC0:
 	bl LogMessageByIdWithPopupCheckUser
 _0231FBCC:
 	mov r0, #1
-	bl ov29_022F62CC
+	bl HandleShopTransaction
 _0231FBD4:
 	mov r0, r4
 	bl MemFree
--- a/asm/overlay_29_0231FC20.s
+++ b/asm/overlay_29_0231FC20.s
@@ -118,7 +118,7 @@ _0231FD1C:
 	b _0231FD1C
 _0231FDB4:
 	mov r0, sl
-	bl ov29_022F9C74
+	bl ActivateTerrainEffects
 	mov r0, sl
 	bl EnsureCanStandCurrentTile
 	mov r0, sl
@@ -371,7 +371,7 @@ _02320118:
 	cmp r0, #0
 	beq _0232014C
 	mov r0, sb
-	bl ov29_022F9C74
+	bl ActivateTerrainEffects
 	mov r0, sb
 	bl EnsureCanStandCurrentTile
 	mov r0, sb
--- a/asm/overlay_29_023201A0.s
+++ b/asm/overlay_29_023201A0.s
@@ -11,7 +11,7 @@ ov29_023201A0: ; 0x023201A0
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, r4
-	bl ov29_022F9C74
+	bl ActivateTerrainEffects
 	mov r0, r4
 	bl EnsureCanStandCurrentTile
 	mov r0, r4
@@ -356,13 +356,13 @@ _02320664:
 	ldr r0, [r1]
 	cmp r0, #1
 	bne _023206A8
-	ldr r2, _0232075C ; =ov29_02353700
+	ldr r2, _0232075C ; =EXPLOSION_FIXED_DAMAGES
 	mov r0, sl
 	ldr r5, [r2, r8, lsl #2]
 	ldr r2, [sp, #0x38]
 	mov r3, fp
 	str r5, [sp]
-	bl ov29_02320AA4
+	bl CalcExplosionDamage
 	bl IsFloorOver
 	cmp r0, #0
 	bne _023206B8
@@ -382,14 +382,14 @@ _023206B8:
 	ldr r0, _02320760 ; =0x0000026F
 	cmp fp, r0
 	beq _023206FC
-	ldr r1, _0232075C ; =ov29_02353700
+	ldr r1, _0232075C ; =EXPLOSION_FIXED_DAMAGES
 	ldr r2, [sp, #0x38]
 	ldr r4, [r1, r8, lsl #2]
 	mov r0, sl
 	mov r1, sb
 	mov r3, fp
 	str r4, [sp]
-	bl ov29_02320AA4
+	bl CalcExplosionDamage
 _023206FC:
 	cmp r6, #0
 	beq _02320744
@@ -425,6 +425,6 @@ _02320750: .word 0x00000BFC
 _02320754: .word 0x00000BFB
 #endif
 _02320758: .word ov29_023529B8
-_0232075C: .word ov29_02353700
+_0232075C: .word EXPLOSION_FIXED_DAMAGES
 _02320760: .word 0x0000026F
 	arm_func_end TryExplosion
--- a/asm/overlay_29_02320788.s
+++ b/asm/overlay_29_02320788.s
@@ -163,13 +163,13 @@ _023209A4:
 	ldr r0, [r1]
 	cmp r0, #1
 	bne _023209E8
-	ldr r2, _02320A9C ; =ov29_02353700
+	ldr r2, _02320A9C ; =EXPLOSION_FIXED_DAMAGES
 	mov r0, sl
 	ldr r5, [r2, r8, lsl #2]
 	ldr r2, [sp, #0x38]
 	mov r3, fp
 	str r5, [sp]
-	bl ov29_02320BCC
+	bl CalcAftermathExplosionDamage
 	bl IsFloorOver
 	cmp r0, #0
 	bne _023209F8
@@ -189,14 +189,14 @@ _023209F8:
 	ldr r0, _02320AA0 ; =0x0000026F
 	cmp fp, r0
 	beq _02320A3C
-	ldr r1, _02320A9C ; =ov29_02353700
+	ldr r1, _02320A9C ; =EXPLOSION_FIXED_DAMAGES
 	ldr r2, [sp, #0x38]
 	ldr r4, [r1, r8, lsl #2]
 	mov r0, sl
 	mov r1, sb
 	mov r3, fp
 	str r4, [sp]
-	bl ov29_02320BCC
+	bl CalcAftermathExplosionDamage
 _02320A3C:
 	cmp r6, #0
 	beq _02320A84
@@ -232,12 +232,12 @@ _02320A90: .word 0x00000BFC
 _02320A94: .word 0x00000BFB
 #endif
 _02320A98: .word ov29_023529B8
-_02320A9C: .word ov29_02353700
+_02320A9C: .word EXPLOSION_FIXED_DAMAGES
 _02320AA0: .word 0x0000026F
 	arm_func_end TryAftermathExplosion

-	arm_func_start ov29_02320AA4
-ov29_02320AA4: ; 0x02320AA4
+	arm_func_start CalcExplosionDamage
+CalcExplosionDamage: ; 0x02320AA4
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, lr}
 	sub sp, sp, #0x24
 	mov r7, r1
@@ -325,10 +325,10 @@ _02320BC0:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
 	.align 2, 0
 _02320BC8: .word 0x00000163
-	arm_func_end ov29_02320AA4
+	arm_func_end CalcExplosionDamage

-	arm_func_start ov29_02320BCC
-ov29_02320BCC: ; 0x02320BCC
+	arm_func_start CalcAftermathExplosionDamage
+CalcAftermathExplosionDamage: ; 0x02320BCC
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, lr}
 	sub sp, sp, #0x24
 	mov r8, r1
@@ -421,7 +421,7 @@ _02320CFC:
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
 _02320D04: .word 0x00000163
-	arm_func_end ov29_02320BCC
+	arm_func_end CalcAftermathExplosionDamage

 	arm_func_start TryWarp
 TryWarp: ; 0x02320D08
@@ -732,7 +732,7 @@ EnsureCanStandCurrentTile: ; 0x02321104
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	add r1, r4, #4
-	bl CannotStandOnTile__023006C8
+	bl CannotStandOnTile
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, r4
@@ -748,7 +748,7 @@ ov29_02321134: ; 0x02321134
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	add r1, r4, #4
-	bl CannotStandOnTile__02300384
+	bl CannotStandOnTileNoMonsterCheck
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, r4
@@ -766,7 +766,7 @@ ov29_02321164: ; 0x02321164
 	mov r5, r0
 	mov r0, r4
 	add r1, r4, #4
-	bl CannotStandOnTile__023006C8
+	bl CannotStandOnTile
 	cmp r0, #0
 	ldmeqia sp!, {r3, r4, r5, pc}
 	mov r0, r5
@@ -810,10 +810,10 @@ _02321200:
 	add r0, r4, #4
 	bl DiscoverMinimap
 	mov r0, #0
-	bl ov29_022F62CC
+	bl HandleShopTransaction
 _02321210:
 	mov r0, r4
-	bl ov29_022F9C74
+	bl ActivateTerrainEffects
 	ldr r1, _02321234 ; =DUNGEON_PTR
 	mov r0, r4
 	ldr r1, [r1]
--- a/asm/overlay_29_02322DDC.s
+++ b/asm/overlay_29_02322DDC.s
@@ -736,13 +736,13 @@ _02323830:
 	blt _02323848
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _02323848:
 	cmp r5, #0
 	blt _0232385C
 	mov r0, r5, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _0232385C:
 	mov r0, #0
 	bl ov29_0234B4CC
--- a/asm/overlay_29_0232393C.s
+++ b/asm/overlay_29_0232393C.s
@@ -189,7 +189,7 @@ _02323BCC:
 	blt _02323BE0
 	mov r0, r4, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl ov10_022BDE50
+	bl TerminateEffectWrapper
 _02323BE0:
 	mov r0, #1
 	bl AnimationDelayOrSomething
--- a/asm/overlay_29_02336450.s
+++ b/asm/overlay_29_02336450.s
@@ -1249,7 +1249,7 @@ _023374D4:
 _02337544:
 	ldr r0, [sp, #0x20]
 	add r1, sp, #0x28
-	bl CannotStandOnTile__02300384
+	bl CannotStandOnTileNoMonsterCheck
 	cmp r0, #0
 	bne _023375DC
 	ldr r0, [sp, #0x20]
@@ -1365,7 +1365,7 @@ _0233762C:
 _023376A8:
 	ldr r0, [sp, #0x20]
 	add r1, sp, #0x28
-	bl CannotStandOnTile__02300384
+	bl CannotStandOnTileNoMonsterCheck
 	cmp r0, #0
 	bne _0233772C
 	ldr r0, [sp, #0x20]
--- a/asm/overlay_29_02348020.s
+++ b/asm/overlay_29_02348020.s
@@ -923,7 +923,7 @@ ov29_02348BA0: ; 0x02348BA0
 	movs r4, r0
 	moveq r0, #0
 	ldmeqia sp!, {r3, r4, r5, pc}
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	beq _02348BD8
 	mov r0, r5
--- a/asm/overlay_29_023498A0.s
+++ b/asm/overlay_29_023498A0.s
@@ -742,7 +742,7 @@ _0234A26C:
 	mov r2, #0
 	bl SubstitutePlaceholderStringTags
 	mov r0, r4
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	bne _0234A2A0
 #ifdef JAPAN
@@ -793,7 +793,7 @@ ov29_0234A2D4: ; 0x0234A2D4
 	mov r2, #0
 	bl SubstitutePlaceholderStringTags
 	mov r0, sl
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	bne _0234A32C
 	ldr r1, _0234A5B0 ; =0x00000E27
@@ -1030,7 +1030,7 @@ ov29_0234A5E4: ; 0x0234A5E4
 	mov r2, #0
 	bl SubstitutePlaceholderStringTags
 	mov r0, r7
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	bne _0234A63C
 	ldr r1, _0234A740 ; =0x00000E2E
@@ -1053,7 +1053,7 @@ _0234A65C:
 	mov r2, #0
 	bl SubstitutePlaceholderStringTags
 	mov r0, r4
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	bne _0234A690
 #ifdef JAPAN
@@ -1320,7 +1320,7 @@ ov29_0234A980: ; 0x0234A980
 	bl ov29_023491B8
 	movs r5, r0
 	beq _0234AA78
-	bl ov29_023009CC
+	bl CanBeTalkedTo
 	cmp r0, #0
 	bne _0234A9DC
 	mov r0, r5
--- a/asm/overlay_29_data_02353700.s
+++ b/asm/overlay_29_data_02353700.s
@@ -6,8 +6,8 @@
 	.global AI_THROWN_ITEM_ACTION_CHOICE_COUNT
 AI_THROWN_ITEM_ACTION_CHOICE_COUNT:
 	.byte 0x00, 0x00, 0x00, 0x00
-	.global ov29_02353700
-ov29_02353700:
+	.global EXPLOSION_FIXED_DAMAGES
+EXPLOSION_FIXED_DAMAGES:
 	.byte 0x28, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00
 	.global ov29_0235370C
 ov29_0235370C:
--- a/asm/overlay_31_02382FBC.s
+++ b/asm/overlay_31_02382FBC.s
@@ -139,7 +139,7 @@ _02383170:
 	strh r1, [sp, #0x10]
 	str ip, [sp]
 	ldr r1, _02383240 ; =0x00001812
-	ldr r3, _02383244 ; =ov31_02383248
+	ldr r3, _02383244 ; =StairsDescriptionCallback
 	add r2, sp, #8
 	str ip, [sp, #4]
 	bl CreateAdvancedTextBox
@@ -180,12 +180,12 @@ _02383234: .word StairsSubheadingCallback
 _02383238: .word ov29_0237C91C
 _0238323C: .word DUNGEON_WINDOW_PARAMS_5
 _02383240: .word 0x00001812
-_02383244: .word ov31_02383248
+_02383244: .word StairsDescriptionCallback
 	arm_func_end HandleStairsMenu

 ; https://decomp.me/scratch/VPa2L
-	arm_func_start ov31_02383248
-ov31_02383248: ; 0x02383248
+	arm_func_start StairsDescriptionCallback
+StairsDescriptionCallback: ; 0x02383248
 	stmdb sp!, {r4, lr}
 	ldr r1, _02383284 ; =ov31_0238A2A0
 	ldr r2, _02383288 ; =OVERLAY31_UNKNOWN_STRING_IDS
@@ -204,7 +204,7 @@ ov31_02383248: ; 0x02383248
 	.align 2, 0
 _02383284: .word ov31_0238A2A0
 _02383288: .word OVERLAY31_UNKNOWN_STRING_IDS
-	arm_func_end ov31_02383248
+	arm_func_end StairsDescriptionCallback

 ; https://decomp.me/scratch/oWQ5d
 	arm_func_start CloseMainStairsMenu
--- a/src/overlay_29_022F0EDC.c
+++ b/src/overlay_29_022F0EDC.c
@@ -50,7 +50,7 @@ extern bool8 CanSeeTarget(struct entity *user, struct entity *target);
 extern bool8 IsBlinded(struct entity *entity, bool8 check_held_item);
 extern void MemZero(u8 *ptr, s32 len);
 extern bool8 ShouldMonsterRunAwayAndShowEffect(struct entity *monster, bool8 show_run_away_effect);
-extern s32 CannotStandOnTile__02300384();
+extern s32 CannotStandOnTileNoMonsterCheck();
 extern s32 ChangeMonsterAnimation();
 extern s32 CheckTouchscreenArea();
 extern s32 GetEntityTouchscreenArea();
@@ -871,7 +871,7 @@ void SetLeaderAction(void)
                            swap_ok = 0;
                        } else if (!ov29_0230105C(leader, lmon->action.direction)) {
                            swap_ok = 0;
-                        } else if (CannotStandOnTile__02300384(ally, &leader->pos) &&
+                        } else if (CannotStandOnTileNoMonsterCheck(ally, &leader->pos) &&
                                   YesNoMenu(0, 0xBA3 + SET_LEADER_ACTION_DATA_OFFSET, 1, 0, 0) == 2) {
                            swap_ok = 0;
                        } else {