Synced from pmdsky-debug

2026-08-28 05:38:04 -05:00 · 2026-07-15 22:12:22 -04:00
parent b1f1a46577
commit a7873e861b
92 changed files with 400 additions and 397 deletions
--- a/asm/include/main_02001A30.inc
+++ b/asm/include/main_02001A30.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/main_02001B0C.inc
+++ b/asm/include/main_02001B0C.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/main_02001CB0.inc
+++ b/asm/include/main_02001CB0.inc
@@ -1 +1,2 @@
 #pragma once
+
--- a/asm/include/main_0200D1F0.inc
+++ b/asm/include/main_0200D1F0.inc
@@ -1,14 +1,4 @@
 #pragma once
-.public BAG_ITEMS_PTR_MIRROR
-.public GetDisplayedBuyPrice
-.public GetDisplayedSellPrice
-.public GetItemActionName
-.public GetItemCategory
-.public GetItemName
-.public GetItemPaletteId
-.public GetMoneyQuantity
-.public InitItem
-.public MoneyQuantityToString__02023B30
 .public _02094D0C
 .public _02097F34
 .public _02097F50
@@ -22,6 +12,16 @@
 .public _02097FB8
 .public _02097FC4
 .public _02097FE4
+.public BAG_ITEMS_PTR_MIRROR
+.public GetDisplayedBuyPrice
+.public GetDisplayedSellPrice
+.public GetItemActionName
+.public GetItemCategory
+.public GetItemName
+.public GetItemPaletteId
+.public GetMoneyQuantity
+.public InitItem
+.public MoneyQuantityToString__02023B30
 .public strcpy
 .public strncpy
 .public sub_0200EB64
--- a/asm/include/main_0200D8E4.inc
+++ b/asm/include/main_0200D8E4.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public _02094D20
 .public AVAILABLE_ITEMS_IN_GROUP_TABLE
 .public BAG_ITEMS_PTR_MIRROR
 .public BitstreamDebug
@@ -7,12 +8,11 @@
 .public GetDungeonGroup
 .public GetExclusiveItemType
 .public GetItemCategory
-.public ITEM_TABLES_PTRS_1
 .public InitBitstreamForRead
 .public InitBitstreamForWrite
 .public IsThrownItem
+.public ITEM_TABLES_PTRS_1
 .public ItemZInit
 .public MemAlloc
 .public MemFree
-.public _02094D20
 .public sub_0200EB64
--- a/asm/include/main_02015090.inc
+++ b/asm/include/main_02015090.inc
@@ -1,3 +1,3 @@
 #pragma once
-.public Rand16Bit
 .public _s32_div_f
+.public Rand16Bit
--- a/asm/include/main_020151E4.inc
+++ b/asm/include/main_020151E4.inc
@@ -1,143 +1,4 @@
 #pragma once
-.public AUDIO_COMMANDS_BUFFER
-.public AddObjToUngroupedOamObjs
-.public BagHasExclusiveItemTypeForMonster
-.public ClearGroupedOamObjsAndGroups
-.public CopyAndInterleave
-.public CopyAndInterleave0
-.public CopyAttributesToOam
-.public CopyColorToPaletteDataRgba
-.public CopyStringFromId
-.public DC_FlushRange
-.public DUNGEON_MOVE_TABLES
-.public Debug_FatalError
-.public Debug_GetDebugFlag
-.public Debug_Print
-.public Debug_Print0
-.public DirectoryFileMngr_GetDirectoryFileSize
-.public DirectoryFileMngr_LoadDirectoryFile
-.public DirectoryFileMngr_OpenDirectoryFile
-.public DseBgm_IsPlaying
-.public DseBgm_Load
-.public DseBgm_SetFades
-.public DseBgm_SetSignalCallback
-.public DseBgm_Stop
-.public DseBgm_Unload
-.public DseDriver_ConfigureHeap
-.public DseDriver_Init
-.public DseDriver_LoadDefaultSettings
-.public DseSe_GetUsedBankIDs
-.public DseSe_HasPlayingInstances
-.public DseSe_Load
-.public DseSe_Play
-.public DseSe_Stop
-.public DseSe_StopAll
-.public DseSe_Unload
-.public DseSequence_GetParameter
-.public DseSwd_IsBankLoading
-.public DseSwd_LoadBank
-.public DseSwd_LoadMainBank
-.public DseSwd_LoadWaves
-.public DseSwd_Unload
-.public DungeonGoesUp
-.public DungeonSwapIdxToId
-.public ENTITIES
-.public EnqueueRender3dTexture
-.public FileClose
-.public FileGetSize
-.public FileRom_HandleOpen
-.public FileRom_HandleRead
-.public FileRom_InitDataTransfer
-.public FileRom_StopDataTransfer
-.public FileRom_Veneer_FileInit
-.public FillPaletteDataRgba
-.public G3i_LookAt_
-.public G3i_OrthoW_
-.public GXS_BeginLoadBGExtPltt
-.public GXS_BeginLoadOBJExtPltt
-.public GXS_EndLoadBGExtPltt
-.public GXS_EndLoadOBJExtPltt
-.public GX_BeginLoadBGExtPltt
-.public GX_BeginLoadOBJExtPltt
-.public GX_BeginLoadTex
-.public GX_BeginLoadTexPltt
-.public GX_EndLoadBGExtPltt
-.public GX_EndLoadOBJExtPltt
-.public GX_EndLoadTex
-.public GX_EndLoadTexPltt
-.public GX_LoadTex
-.public GX_LoadTexPltt
-.public GetAbility
-.public GetAbilityString
-.public GetActiveRosterIndex
-.public GetActiveTeamMember
-.public GetActorMatchingStorageId
-.public GetCurrentBagCapacity
-.public GetDsFirmwareUserSettingsVeneer
-.public GetExecuteSpecialEpisodeType
-.public GetGameMode
-.public GetIqSkillStringId
-.public GetItemMoveId16
-.public GetItemNameFormatted
-.public GetMainTeamName
-.public GetMonsterGender
-.public GetMonsterGenderVeneer
-.public GetMoveActualAccuracy
-.public GetMoveBasePowerFromId
-.public GetMoveName
-.public GetNameString
-.public GetNbFloors
-.public GetNbFloorsPlusOne
-.public GetResolvedPerformanceProgressFlag
-.public GetStringFromFileVeneer
-.public GetTeamMember
-.public GetTypeStringId
-.public GroupOamObjs
-.public InitOamInfo
-.public IqSkillFlagTest
-.public LANGUAGE_INFO_DATA
-.public LoadFileFromRom
-.public LoadScriptVariableValue
-.public LoadScriptVariableValueAtIndex
-.public LoadScriptVariableValueString
-.public LoadStringFile
-.public MOVE_ACCURACY_STARS_TABLE
-.public MOVE_POWER_STARS_TABLE
-.public MTi_CpuClear32
-.public MTi_CpuCopy32
-.public MarkPaletteDataAsNeedingUpdate
-.public MaybeGetFormattedItemName
-.public MemAlloc
-.public MemArenaAlloc
-.public MemFree
-.public MemLocateSet
-.public MemLocateUnset
-.public MemZero
-.public MemZero32
-.public Memcpy32
-.public MultiplyByFixedPoint
-.public NewRender3dQuadrilateral
-.public NewRender3dRectangle
-.public NewRender3dTexture
-.public NewRender3dTiling
-.public OBJ_GRAPHICS_CONTROLS_PTR
-.public PointsToZero
-.public RENDER_3D
-.public RENDER_3D_FUNCTIONS_64
-.public Rand16Bit
-.public Render3dProcessQueue
-.public ResumeBgm
-.public Rgb8ToRgb5
-.public SND_Init
-.public SetShouldCopyToOam
-.public Snd_LockChannel
-.public Snd_UnlockChannel
-.public StringFromId
-.public StrncpySimpleNoPadSafe
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public WAN_TABLE
-.public ZInit8
 .public _02098EA8
 .public _02098EE0
 .public _02098F60
@@ -400,14 +261,149 @@
 .public _022A5970
 .public _s32_div_f
 .public _u32_div_f
+.public AddObjToUngroupedOamObjs
+.public AUDIO_COMMANDS_BUFFER
+.public BagHasExclusiveItemTypeForMonster
+.public ClearGroupedOamObjsAndGroups
+.public CopyAndInterleave
+.public CopyAndInterleave0
+.public CopyAttributesToOam
+.public CopyColorToPaletteDataRgba
+.public CopyStringFromId
+.public DC_FlushRange
+.public Debug_FatalError
+.public Debug_GetDebugFlag
+.public Debug_Print
+.public Debug_Print0
+.public DirectoryFileMngr_GetDirectoryFileSize
+.public DirectoryFileMngr_LoadDirectoryFile
+.public DirectoryFileMngr_OpenDirectoryFile
+.public DseBgm_IsPlaying
+.public DseBgm_Load
+.public DseBgm_SetFades
+.public DseBgm_SetSignalCallback
+.public DseBgm_Stop
+.public DseBgm_Unload
+.public DseDriver_ConfigureHeap
+.public DseDriver_Init
+.public DseDriver_LoadDefaultSettings
+.public DseSe_GetUsedBankIDs
+.public DseSe_HasPlayingInstances
+.public DseSe_Load
+.public DseSe_Play
+.public DseSe_Stop
+.public DseSe_StopAll
+.public DseSe_Unload
+.public DseSequence_GetParameter
+.public DseSwd_IsBankLoading
+.public DseSwd_LoadBank
+.public DseSwd_LoadMainBank
+.public DseSwd_LoadWaves
+.public DseSwd_Unload
+.public DUNGEON_MOVE_TABLES
+.public DungeonGoesUp
+.public DungeonSwapIdxToId
+.public EnqueueRender3dTexture
+.public ENTITIES
+.public FileClose
+.public FileGetSize
+.public FileRom_HandleOpen
+.public FileRom_HandleRead
+.public FileRom_InitDataTransfer
+.public FileRom_StopDataTransfer
+.public FileRom_Veneer_FileInit
+.public FillPaletteDataRgba
+.public G3i_LookAt_
+.public G3i_OrthoW_
+.public GetAbility
+.public GetAbilityString
+.public GetActiveRosterIndex
+.public GetActiveTeamMember
+.public GetActorMatchingStorageId
+.public GetCurrentBagCapacity
+.public GetDsFirmwareUserSettingsVeneer
+.public GetExecuteSpecialEpisodeType
+.public GetGameMode
+.public GetIqSkillStringId
+.public GetItemMoveId16
+.public GetItemNameFormatted
+.public GetMainTeamName
+.public GetMonsterGender
+.public GetMonsterGenderVeneer
+.public GetMoveActualAccuracy
+.public GetMoveBasePowerFromId
+.public GetMoveName
+.public GetNameString
+.public GetNbFloors
+.public GetNbFloorsPlusOne
+.public GetResolvedPerformanceProgressFlag
+.public GetStringFromFileVeneer
+.public GetTeamMember
+.public GetTypeStringId
+.public GroupOamObjs
+.public GX_BeginLoadBGExtPltt
+.public GX_BeginLoadOBJExtPltt
+.public GX_BeginLoadTex
+.public GX_BeginLoadTexPltt
+.public GX_EndLoadBGExtPltt
+.public GX_EndLoadOBJExtPltt
+.public GX_EndLoadTex
+.public GX_EndLoadTexPltt
+.public GX_LoadTex
+.public GX_LoadTexPltt
+.public GXS_BeginLoadBGExtPltt
+.public GXS_BeginLoadOBJExtPltt
+.public GXS_EndLoadBGExtPltt
+.public GXS_EndLoadOBJExtPltt
+.public InitOamInfo
+.public IqSkillFlagTest
+.public LANGUAGE_INFO_DATA
+.public LoadFileFromRom
+.public LoadScriptVariableValue
+.public LoadScriptVariableValueAtIndex
+.public LoadScriptVariableValueString
+.public LoadStringFile
+.public MarkPaletteDataAsNeedingUpdate
+.public MaybeGetFormattedItemName
+.public MemAlloc
+.public MemArenaAlloc
+.public Memcpy32
+.public MemFree
+.public MemLocateSet
+.public MemLocateUnset
+.public MemZero
+.public MemZero32
+.public MOVE_ACCURACY_STARS_TABLE
+.public MOVE_POWER_STARS_TABLE
+.public MTi_CpuClear32
+.public MTi_CpuCopy32
+.public MultiplyByFixedPoint
+.public NewRender3dQuadrilateral
+.public NewRender3dRectangle
+.public NewRender3dTexture
+.public NewRender3dTiling
+.public OBJ_GRAPHICS_CONTROLS_PTR
 .public ov10_022BDADC
 .public ov10_022C2528
+.public PointsToZero
+.public Rand16Bit
+.public Render3dProcessQueue
+.public RENDER_3D
+.public RENDER_3D_FUNCTIONS_64
+.public ResumeBgm
+.public Rgb8ToRgb5
+.public SetShouldCopyToOam
+.public SND_Init
+.public Snd_LockChannel
+.public Snd_UnlockChannel
 .public sprintf
 .public strcat
 .public strcmp
 .public strcpy
+.public StringFromId
 .public strlen
 .public strncmp
+.public StrncpySimpleNoPadSafe
 .public strstr
 .public sub_01FF8F04
 .public sub_02002778
@@ -470,4 +466,8 @@
 .public sub_0206C6BC
 .public sub_0206C754
 .public sub_0206F5C8
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
 .public vsprintf
+.public WAN_TABLE
+.public ZInit8
--- a/asm/include/main_02029A68.inc
+++ b/asm/include/main_02029A68.inc
@@ -6,6 +6,7 @@
 .public ALERT_SPRITE_ID
 .public CURSOR_16_ANIMATION_CONTROL
 .public CURSOR_ANIMATION_CONTROL
+.public DisplayAndSwitchAnimationControlCurrentFrame
 .public FillOamAttributeInfo
 .public InitAnimationControlWithSet__0201C0B0
 .public InitRender3dElement64
@@ -15,7 +16,6 @@
 .public SetAnimationForAnimationControl
 .public SetSpriteIdForAnimationControl
 .public sub_0201C028
-.public sub_0201CF5C
 .public sub_02025D90
 .public sub_02029478
 .public sub_020334A8
--- a/asm/include/main_0206A878.inc
+++ b/asm/include/main_0206A878.inc
@@ -29,6 +29,7 @@
 .public Debug_Print0
 .public DelayWteFree
 .public DeleteWanTableEntryVeneer
+.public DisplayAndSwitchAnimationControlCurrentFrame
 .public DRIVER_WORK
 .public DseBgm_StopAll
 .public DseBgm_SysSetupNoteList
@@ -64,7 +65,6 @@
 .public SetAnimationForAnimationControl
 .public SetSpriteIdForAnimationControl
 .public SinAbs4096
-.public sub_0201CF5C
 .public sub_0201D12C
 .public sub_0201D9C8
 .public sub_0201DF38
--- a/asm/include/overlay_01.inc
+++ b/asm/include/overlay_01.inc
@@ -35,6 +35,7 @@
 .public DC_InvalidateRange
 .public Debug_Print0
 .public DeleteWanTableEntryVeneer
+.public DisplayAndSwitchAnimationControlCurrentFrame
 .public DrawChar
 .public DrawTextInWindow
 .public Dwc_ProcessFriendsMatch
@@ -246,7 +247,6 @@
 .public sub_0200DFE4
 .public sub_0200EB64
 .public sub_0201C138
-.public sub_0201CF5C
 .public sub_0201D12C
 .public sub_0202065C
 .public sub_0202380C_EU
--- a/asm/include/overlay_10_022BCC7C.inc
+++ b/asm/include/overlay_10_022BCC7C.inc
@@ -13,6 +13,7 @@
 .public DeleteWanTableEntryVeneer
 .public DeleteWindow
 .public DirectoryFileMngr_GetDirectoryFileSize
+.public DisplayAndSwitchAnimationControlCurrentFrame
 .public DrawTextInWindow
 .public EFFECT_ANIMATION_INFO
 .public FillOamAttributeInfo
@@ -114,7 +115,6 @@
 .public sub_0200B3FC
 .public sub_0201C108
 .public sub_0201C138
-.public sub_0201CF5C
 .public sub_0201CF80
 .public sub_0201D034
 .public sub_0201D0F8
--- a/asm/include/overlay_11_022EE5E4.inc
+++ b/asm/include/overlay_11_022EE5E4.inc
@@ -61,6 +61,7 @@
 .public DeleteWindow
 .public DigitInputMenuInit
 .public DigitInputMenuReturn
+.public DisplayAndSwitchAnimationControlCurrentFrame
 .public DrawTextInWindow
 .public DungeonMoveToGroundMove
 .public DungeonSwapIdxToId
@@ -836,7 +837,6 @@
 .public sub_02017C50
 .public sub_02017C74
 .public sub_0201C108
-.public sub_0201CF5C
 .public sub_0201CF90
 .public sub_0201D100
 .public sub_0201D18C
--- a/asm/include/overlay_29_022E1640.inc
+++ b/asm/include/overlay_29_022E1640.inc
@@ -1,13 +1,13 @@
 #pragma once
+.public AnimateFlyingMoves
+.public CopyStatusIconFlags
+.public CreateTrapAndStairsHallucinations
+.public DisplayItem
+.public DisplayMonster
 .public DisplayTeamStatsSprite
 .public DUNGEON_PTR
 .public EntityIsValid__022E1A1C
 .public InitAnimationControlWithSet__0201C0CC
 .public ov29_022DD7D8
-.public ov29_022E3A40
-.public ov29_022ED9D0
-.public ov29_02303F18
-.public ov29_023046E8
-.public ov29_023457C8
 .public ov29_0237C754
 .public ov29_0237C79C
--- a/asm/include/overlay_29_022E9618.inc
+++ b/asm/include/overlay_29_022E9618.inc
@@ -7,6 +7,7 @@
 .public DISPLACEMENTS_WITHIN_2_LARGEST_FIRST
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DISPLACEMENTS_WITHIN_3
+.public DisplayMonstersAndItems
 .public DisplayUi
 .public DUNGEON_BUTTON_INPUT
 .public DUNGEON_FRAMES_PASSED
@@ -31,7 +32,6 @@
 .public ov29_022DE11C
 .public ov29_022DE134
 .public ov29_022DE638
-.public ov29_022E1854
 .public ov29_022E335C
 .public ov29_022E8C10
 .public ov29_022ED800
--- a/asm/include/overlay_29_022EBCE8.inc
+++ b/asm/include/overlay_29_022EBCE8.inc
@@ -13,8 +13,8 @@
 .public FRACTIONAL_TURN_SEQUENCE
 .public GetLeader
 .public IsFloorOver
+.public IsFloorOver2
 .public ov29_022E81F8
-.public ov29_022EF9C8
 .public ov29_02348FD8
 .public ov29_023522B6
 .public RunMonsterAi
--- a/asm/include/overlay_29_022EC62C.inc
+++ b/asm/include/overlay_29_022EC62C.inc
@@ -12,11 +12,11 @@
 .public GetLeader
 .public GetMonsterName
 .public HandleFaint
+.public IsFloorOver2
 .public LogMessageByIdWithPopupCheckUser
 .public ov10_022C6320
 .public ov29_022E5DBC
 .public ov29_022EAEF0
-.public ov29_022EF9C8
 .public ov29_022F2FE4
 .public ov29_023522B6
 .public ov29_02352380
--- a/asm/include/overlay_29_022EE36C.inc
+++ b/asm/include/overlay_29_022EE36C.inc
@@ -7,6 +7,7 @@
 .public BAG_ITEMS_PTR_MIRROR
 .public CalcStatusDuration
 .public ChangeMonsterAnimation
+.public ChangeMonsterAnimationToIdle
 .public DIRECTIONS_XY
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
 .public DisplayLinkedMovesWarnings
@@ -54,7 +55,6 @@
 .public ov29_022EA370
 .public ov29_022FB920
 .public ov29_022FBD80
-.public ov29_02304A48
 .public ov29_02346344
 .public PITFALL_TRAP_DAMAGE
 .public PlaySeByIdIfShouldDisplayEntity
--- a/asm/include/overlay_29_022EF7C4.inc
+++ b/asm/include/overlay_29_022EF7C4.inc
@@ -1,9 +1,9 @@
 #pragma once
 .public ChangeDungeonMusic
-.public ChangeMonsterAnimationToIdle
 .public DUNGEON_PTR
 .public EntityIsValid__022EF7A0
 .public IsFloorOver
+.public MakeMonsterIdleInDirection2
 .public MoveMonsterToPos
 .public ov29_023444D4
 .public ov29_02348F20
--- a/asm/include/overlay_29_022F05B4.inc
+++ b/asm/include/overlay_29_022F05B4.inc
@@ -12,10 +12,10 @@
 .public BAG_ITEMS_PTR_MIRROR
 .public CanMonsterMoveInDirection
 .public CanMonsterMoveOrSwapWithAllyInDirection
+.public CannotStandOnTile__02300384
 .public CanSeeTarget
 .public CeilFixedPoint
 .public ChangeMonsterAnimation
-.public ChangeMonsterAnimationToIdle
 .public CheckMonsterTeamMemberIdx
 .public CheckTeamItemsFlags
 .public CheckTouchscreenArea
@@ -76,6 +76,7 @@
 .public LogItemBlockedByEmbargo
 .public LogMessageByIdWithPopup
 .public LogMessageByIdWithPopupCheckUser
+.public MakeMonsterIdleInDirection2
 .public MemAlloc
 .public MemFree
 .public MemZero
@@ -112,7 +113,6 @@
 .public ov29_022F9EA0
 .public ov29_022FA2F0
 .public ov29_022FB920
-.public ov29_022FF958
 .public ov29_022FFA94
 .public ov29_023009CC
 .public ov29_02300FCC
--- a/asm/include/overlay_29_022F52B0.inc
+++ b/asm/include/overlay_29_022F52B0.inc
@@ -2,6 +2,7 @@
 .public ApplyItemEffect
 .public CanMonsterUseItem
 .public ChangeMonsterAnimation
+.public ChangeMonsterAnimationToIdle
 .public DecrementStackItem
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -11,6 +12,7 @@
 .public GetItemToUse
 .public GetMessageLogPreprocessorArgs
 .public HandleCurvedProjectileThrow
+.public HandleRegularProjectileThrow
 .public IqSkillIsEnabled
 .public ItemIsActive__022F5994
 .public ItemZInit
@@ -22,12 +24,10 @@
 .public ov29_022EA370
 .public ov29_022EB378
 .public ov29_022F3B8C
-.public ov29_02304A48
 .public ov29_0230F9A4
 .public ov29_02343D30
 .public ov29_02346FB8
 .public ov29_02347000
-.public ov29_02347518
 .public PlaySeByIdIfShouldDisplayEntity
 .public PrepareItemForPrinting__02345728
 .public PrepareItemForPrinting__02345754
--- a/asm/include/overlay_29_022F59C4.inc
+++ b/asm/include/overlay_29_022F59C4.inc
@@ -33,6 +33,7 @@
 .public IsMonsterIdInNormalRangeVeneer
 .public IsSecretBazaarNpcBehavior
 .public LogMessageByIdWithPopupCheckUser
+.public MakeMonsterIdleInDirection
 .public ov29_022E690C
 .public ov29_022E8104
 .public ov29_022E81F8
@@ -40,7 +41,6 @@
 .public ov29_022F6748
 .public ov29_022F87C0
 .public ov29_023009CC
-.public ov29_02304AFC
 .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,7 @@
 .public AnimationDelayOrSomething
 .public BAG_ITEMS_PTR_MIRROR
 .public CalcSpeedStageWrapper
+.public ChangeMonsterAnimationToIdle
 .public DeleteWanTableEntryVeneer
 .public DisplayMessage2
 .public DUNGEON_PTR
@@ -42,7 +43,6 @@
 .public ov29_022FF764
 .public ov29_023009CC
 .public ov29_02304A00
-.public ov29_02304A48
 .public ov29_0231B490
 .public ov29_0231B4AC
 .public ov29_02352760
--- a/asm/include/overlay_29_022F7768.inc
+++ b/asm/include/overlay_29_022F7768.inc
@@ -5,6 +5,7 @@
 .public CheckBossFightVictory
 .public CheckTeamMemberIdx
 .public CreateMonsterSummaryFromEntityOuter
+.public CreateTemporaryEntity
 .public DeleteWanTableEntryVeneer
 .public DetermineMonsterShadow
 .public DIRECTIONS_XY
@@ -48,7 +49,6 @@
 .public OpenMessageLog
 .public ov29_022DDB68
 .public ov29_022E1C0C
-.public ov29_022E2470
 .public ov29_022E68BC
 .public ov29_022E8104
 .public ov29_022E81F8
--- a/asm/include/overlay_29_022F9744.inc
+++ b/asm/include/overlay_29_022F9744.inc
@@ -6,6 +6,8 @@
 .public BELLY_DRAIN_IN_WALLS_INT
 .public CeilFixedPoint
 .public ChangeMonsterAnimation
+.public ChangeMonsterAnimationToIdle
+.public ChangeTeamAnimationsToIdle
 .public CheckTeamMemberIdx
 .public CheckVariousStatuses2__02301244
 .public CheckVariousStatuses__023016DC
@@ -40,9 +42,7 @@
 .public ov29_022E4160
 .public ov29_022E81F8
 .public ov29_022EA370
-.public ov29_022EF938
 .public ov29_022F87C0
-.public ov29_02304A48
 .public ov29_02307CE0
 .public ov29_02307DD0
 .public PointCameraToMonster
--- a/asm/include/overlay_29_022FA524.inc
+++ b/asm/include/overlay_29_022FA524.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public AbilityIsActiveVeneer
 .public CanMonsterSpawn
+.public ChangeMonsterAnimationToIdle
 .public CheckTeamMemberIdx
 .public DefenderAbilityIsActive__022F96CC
 .public DUNGEON_PTR
@@ -26,7 +27,6 @@
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EA370
-.public ov29_02304A48
 .public PrepareItemForPrinting__02345728
 .public RestoreAllMovePP
 .public SetPreprocessorArgsIdVal
--- a/asm/include/overlay_29_022FC9C0.inc
+++ b/asm/include/overlay_29_022FC9C0.inc
@@ -2,6 +2,7 @@
 .public AddHeldItemToBag
 .public CalcSpeedStageWrapper
 .public CASTFORM_WEATHER_ATTRIBUTE_TABLE
+.public ChangeMonsterAnimationToIdle
 .public CountActiveMonsters
 .public CreateEnemyEntity
 .public DIRECTIONS_XY
@@ -85,7 +86,6 @@
 .public ov29_022FBF08
 .public ov29_022FBF30
 .public ov29_022FC468
-.public ov29_02304A48
 .public ov29_02307DC0
 .public ov29_02351E28
 .public ov29_0235276C
--- a/asm/include/overlay_29_022FE4BC.inc
+++ b/asm/include/overlay_29_022FE4BC.inc
@@ -4,7 +4,7 @@
 .public AdvanceFrame
 .public AnimationDelayOrSomething
 .public CanMonsterMoveInDirection
-.public CannotStandOnTile
+.public CannotStandOnTile__023006C8
 .public DIRECTIONS_XY
 .public DisplayActions
 .public DUNGEON_PTR
--- a/asm/include/overlay_29_023026FC.inc
+++ b/asm/include/overlay_29_023026FC.inc
@@ -1,5 +1,6 @@
 #pragma once
 .public AllocateTemp1024ByteBufferFromPool
+.public CreateTemporaryEntity
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonRandInt
@@ -13,7 +14,6 @@
 .public IsOnMonsterSpawnList
 .public LevelUp
 .public LogMessageByIdWithPopup
-.public ov29_022E2470
 .public ov29_02302C04
 .public ov29_02302CC8
 .public ov29_023527F8
--- a/asm/include/overlay_29_02302A5C.inc
+++ b/asm/include/overlay_29_02302A5C.inc
@@ -2,7 +2,9 @@
 .public AddSimpleObjToOam
 .public AllocateTemp1024ByteBufferFromPool
 .public ChangeMonsterAnimation
+.public CopyStatusIconFlags
 .public DIRECTIONS_XY
+.public DisplayAndSwitchAnimationControlCurrentFrame
 .public DisplayMessage
 .public DisplayMessage2
 .public DUNGEON_FRAMES_PASSED
@@ -46,7 +48,6 @@
 .public ov29_022E273C
 .public ov29_022E3570
 .public ov29_022E3580
-.public ov29_022E3A40
 .public ov29_022E6724
 .public ov29_022E6E80
 .public ov29_022EA370
@@ -86,7 +87,6 @@
 .public strcpy
 .public StringFromId
 .public sub_020149C0
-.public sub_0201CF5C
 .public sub_0201D034
 .public sub_0201D198
 .public sub_0201D1B0
--- a/asm/include/overlay_29_023047DC.inc
+++ b/asm/include/overlay_29_023047DC.inc
@@ -19,11 +19,11 @@
 .public GetTileAtEntity
 .public IncrementEntityPixelPosXY
 .public IsFloorOver
+.public IsFloorOver2
 .public IsWaterTileset
 .public ov29_022E8104
 .public ov29_022EA370
 .public ov29_022EF9BC
-.public ov29_022EF9C8
 .public ov29_022F62CC
 .public ov29_022F9C74
 .public ov29_02305814
--- a/asm/include/overlay_29_02305C28.inc
+++ b/asm/include/overlay_29_02305C28.inc
@@ -4,6 +4,7 @@
 .public ApplyDamageAndEffectsWrapper
 .public CalcSpeedStageWrapper
 .public CalcStatusDuration
+.public ChangeMonsterAnimationToIdle
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public EndNegativeStatusCondition
@@ -29,7 +30,6 @@
 .public ov29_022FA1D8
 .public ov29_022FB984
 .public ov29_02304830
-.public ov29_02304A48
 .public ov29_02311C28
 .public ov29_02321134
 .public SafeguardIsActive
--- a/asm/include/overlay_29_02308FE0.inc
+++ b/asm/include/overlay_29_02308FE0.inc
@@ -10,6 +10,7 @@
 .public CanSeeTarget
 .public ChangeDungeonMusic
 .public ChangeMonsterAnimation
+.public ChangeMonsterAnimationToIdle
 .public DAMAGE_STRING_IDS
 .public DEFEAT_STRING_IDS
 .public DefenderAbilityIsActive__0230A940
@@ -74,7 +75,6 @@
 .public ov29_022FBD24
 .public ov29_02303E0C
 .public ov29_02304830
-.public ov29_02304A48
 .public ov29_02307C48
 .public ov29_02307DC0
 .public ov29_0230D628
--- a/asm/include/overlay_29_0230BBAC.inc
+++ b/asm/include/overlay_29_0230BBAC.inc
@@ -10,6 +10,7 @@
 .public CalcTypeBasedDamageEffects
 .public CeilFixedPoint
 .public ClampedLn
+.public CreateTemporaryEntity
 .public DAMAGE_FORMULA_AT_PREFACTOR
 .public DAMAGE_FORMULA_CONSTANT_SHIFT
 .public DAMAGE_FORMULA_DEF_PREFACTOR
@@ -71,7 +72,6 @@
 .public ov10_022BDE50
 .public ov10_022BF964
 .public ov10_022C45B4
-.public ov29_022E2470
 .public ov29_02352838
 .public ov29_02352894
 .public ov29_02352984
--- a/asm/include/overlay_29_0230E064.inc
+++ b/asm/include/overlay_29_0230E064.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public abs
 .public CanSeeTarget
+.public ChangeMonsterAnimationToIdle
 .public DUNGEON_PTR
 .public DungeonModeSetupAndShowNameKeyboard
 .public EnableAllLearnableIqSkills
@@ -31,7 +32,6 @@
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EACAC
-.public ov29_02304A48
 .public ov29_02305F60
 .public ov29_0230E5A8
 .public ov29_0230E5FC
--- a/asm/include/overlay_29_023118D8.inc
+++ b/asm/include/overlay_29_023118D8.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public ChangeMonsterAnimationToIdle
 .public DefenderAbilityIsActive__02311B94
 .public EntityIsValid__023118B4
 .public ExclusiveItemEffectIsActiveWithLogging
@@ -8,7 +9,6 @@
 .public ItemIsActive__02311BF8
 .public LogMessageByIdWithPopupCheckUserTarget
 .public ov29_022E3E74
-.public ov29_02304A48
 .public SafeguardIsActive
 .public SubstitutePlaceholderStringTags
 .public TryActivateQuickFeet
--- a/asm/include/overlay_29_02311C28.inc
+++ b/asm/include/overlay_29_02311C28.inc
@@ -3,6 +3,8 @@
 .public BADLY_POISONED_TURN_RANGE
 .public BURN_TURN_RANGE
 .public CalcStatusDuration
+.public ChangeMonsterAnimationToHurt
+.public ChangeMonsterAnimationToIdle
 .public ChangeShayminForme
 .public CONSTRICTION_TURN_RANGE
 .public CopyStringFromId
@@ -39,8 +41,6 @@
 .public ov29_022E4C4C
 .public ov29_022E4D24
 .public ov29_022E53EC
-.public ov29_02304A48
-.public ov29_02304A84
 .public PETRIFIED_TURN_RANGE
 .public PLAYER_PETRIFIED_TURN_RANGE
 .public POISONED_TURN_RANGE
--- a/asm/include/overlay_29_0231EDFC.inc
+++ b/asm/include/overlay_29_0231EDFC.inc
@@ -5,6 +5,7 @@
 .public CalcDamageFixedNoCategory
 .public CanSeeTarget
 .public ChangeMonsterAnimation
+.public ChangeMonsterAnimationToIdle
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -21,7 +22,6 @@
 .public ov29_022E9298
 .public ov29_022EA370
 .public ov29_022FF764
-.public ov29_02304A48
 .public ov29_0232033C
 .public ov29_02321238
 .public PlaySeByIdIfNotSilence
--- a/asm/include/overlay_29_0231F594.inc
+++ b/asm/include/overlay_29_0231F594.inc
@@ -7,6 +7,7 @@
 .public DetermineAllMonsterShadow
 .public DetermineTileWalkableNeighbors
 .public DISPLACEMENTS_WITHIN_2_SMALLEST_FIRST
+.public DisplayItem
 .public DrawMinimapTile
 .public DUNGEON_PTR
 .public EntityIsValid__0231FBFC
@@ -20,7 +21,6 @@
 .public MemFree
 .public ov29_022F62CC
 .public ov29_02336694
-.public ov29_023457C8
 .public PlaySeByIdIfShouldDisplayEntity
 .public RemoveGroundItem
 .public SetEntityPixelPosXY
--- a/asm/include/overlay_29_02320788.inc
+++ b/asm/include/overlay_29_02320788.inc
@@ -4,7 +4,9 @@
 .public AreTileJumpsAllowed
 .public CalcDamageFixedNoCategory
 .public CanMonsterUseMove
-.public CannotStandOnTile
+.public CannotStandOnTile__02300384
+.public CannotStandOnTile__023006C8
+.public ChangeMonsterAnimationToIdle
 .public DetermineTileWalkableNeighbors
 .public DiscoverMinimap
 .public DUNGEON_FRAMES_PASSED
@@ -33,8 +35,6 @@
 .public ov29_022F87C0
 .public ov29_022F9C74
 .public ov29_022FAA04
-.public ov29_022FF958
-.public ov29_02304A48
 .public ov29_02305814
 .public ov29_02322374
 .public ov29_023247B4
--- a/asm/include/overlay_29_02322DDC.inc
+++ b/asm/include/overlay_29_02322DDC.inc
@@ -2,6 +2,7 @@
 .public _s32_div_f
 .public AdvanceFrame
 .public AnimationDelayOrSomething
+.public ChangeMonsterAnimationToIdle
 .public CosAbs4096
 .public DIRECTIONS_XY
 .public DUNGEON_PTR
@@ -29,7 +30,6 @@
 .public ov29_022E2CA0
 .public ov29_022EA370
 .public ov29_023024E0
-.public ov29_02304A48
 .public ov29_023243B4
 .public ov29_02324D60
 .public ov29_02324E78
--- a/asm/include/overlay_29_02324BE8.inc
+++ b/asm/include/overlay_29_02324BE8.inc
@@ -3,6 +3,7 @@
 .public AnimationDelayOrSomething
 .public AnimationHasMoreFrames
 .public ChangeMonsterAnimation
+.public ChangeMonsterAnimationToIdle
 .public DUNGEON_PTR
 .public DungeonRandInt
 .public EntityIsValid__02321438
@@ -31,7 +32,6 @@
 .public ov29_022EA370
 .public ov29_022ED0C4
 .public ov29_022ED0D4
-.public ov29_02304A48
 .public ov29_02325644
 .public ov29_02325D20
 .public ov29_02325D7C
--- a/asm/include/overlay_29_0232E864.inc
+++ b/asm/include/overlay_29_0232E864.inc
@@ -8,6 +8,7 @@
 .public CanBeSnatched
 .public CanHitWithRegularAttack
 .public CeilFixedPoint
+.public ChangeMonsterAnimationToIdle
 .public DefenderAbilityIsActive__02332A0C
 .public DIRECTIONS_XY
 .public DisplayAnimatedNumbers
@@ -382,7 +383,6 @@
 .public ov29_02300D50
 .public ov29_02300DC0
 .public ov29_02301C2C
-.public ov29_02304A48
 .public ov29_02304C3C
 .public ov29_02314DC4
 .public ov29_0231AD38
--- a/asm/include/overlay_29_02332A70.inc
+++ b/asm/include/overlay_29_02332A70.inc
@@ -3,6 +3,7 @@
 .public ApplyDamageAndEffects
 .public CalcDamage
 .public CanAttackInDirection
+.public ChangeMonsterAnimationToIdle
 .public DefenderAbilityIsActive__02332A0C
 .public DisplayAnimatedNumbers
 .public DUNGEON_PTR
@@ -18,7 +19,6 @@
 .public LogMessageByIdWithPopupCheckUserTarget
 .public MoveHitCheck
 .public ov29_022E576C
-.public ov29_02304A48
 .public ov29_0230D088
 .public SetPreprocessorArgsStringToName
 .public ShouldDisplayEntityWrapper
--- a/asm/include/overlay_29_02336450.inc
+++ b/asm/include/overlay_29_02336450.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public CannotStandOnTile__02300384
 .public CanSeePosition
 .public Debug_Print0
 .public DEFAULT_TILE
@@ -27,7 +28,6 @@
 .public ov29_022DE0EC
 .public ov29_022E66C4
 .public ov29_022E9F80
-.public ov29_022FF958
 .public ov29_02352B60
 .public ov29_02352B74
 .public ov29_02352B88
--- a/asm/include/overlay_29_02346834.inc
+++ b/asm/include/overlay_29_02346834.inc
@@ -8,6 +8,8 @@
 .public CleanStickyItemsInBag
 .public ClearItem
 .public DIRECTIONS_XY
+.public DisplayItem
+.public DisplayThrownItemShadow
 .public DoesMonsterHaveMove
 .public DoesProjectileHitTarget
 .public DUNGEON_PTR
@@ -45,12 +47,10 @@
 .public MONEY_QUANTITY_TABLE
 .public MonsterHasEmbargoStatus
 .public ov10_022C4CD8
-.public ov29_022E9488
 .public ov29_022EBB8C
 .public ov29_022EBB98
 .public ov29_022FB920
 .public ov29_023009A0
-.public ov29_023457C8
 .public ov29_0234B4CC
 .public ov29_023516FC
 .public ov29_023531C8
--- a/asm/main_020151E4.s
+++ b/asm/main_020151E4.s
@@ -2890,7 +2890,7 @@ _02017438:
 	b _020174A8
 _02017464:
 	add r0, r4, #0x98
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	add r0, r4, #0x98
 	bl sub_0201D1B0
 	cmp r0, #0
@@ -2916,7 +2916,7 @@ _020174A8:
 	mov r5, #0x7c
 _020174C0:
 	mla r0, r7, r5, r6
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	add r7, r7, #1
 	cmp r7, #7
 	blt _020174C0
@@ -2956,7 +2956,7 @@ _020174EC:
 	bl SetAnimationForAnimationControl
 _02017554:
 	mov r0, sb
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02017568
 _02017560:
 	sub r0, r0, #1
@@ -9398,8 +9398,8 @@ LoadAnimationFrameAndIncrementInAnimationControl: ; 0x0201C560
 	bx lr
 	arm_func_end LoadAnimationFrameAndIncrementInAnimationControl

-	arm_func_start sub_0201C5C4
-sub_0201C5C4: ; 0x0201C5C4
+	arm_func_start DisplayAnimationControlCurrentFrame
+DisplayAnimationControlCurrentFrame: ; 0x0201C5C4
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	sub sp, sp, #0x90
 	mov r8, r0
@@ -10058,20 +10058,20 @@ _0201CF4C: .word _020AFC50
 _0201CF50: .word _020AFC30
 _0201CF54: .word OBJ_GRAPHICS_CONTROLS_PTR
 _0201CF58: .word 0x0000FFFF
-	arm_func_end sub_0201C5C4
+	arm_func_end DisplayAnimationControlCurrentFrame

-	arm_func_start sub_0201CF5C
-sub_0201CF5C: ; 0x0201CF5C
+	arm_func_start DisplayAndSwitchAnimationControlCurrentFrame
+DisplayAndSwitchAnimationControlCurrentFrame: ; 0x0201CF5C
 	stmdb sp!, {r4, lr}
 	mov r4, r0
-	bl sub_0201C5C4
+	bl DisplayAnimationControlCurrentFrame
 	ldrh r0, [r4, #2]
 	tst r0, #0x10
 	ldmneia sp!, {r4, pc}
 	mov r0, r4
 	bl SwitchAnimationControlToNextFrame
 	ldmia sp!, {r4, pc}
-	arm_func_end sub_0201CF5C
+	arm_func_end DisplayAndSwitchAnimationControlCurrentFrame

 	arm_func_start sub_0201CF80
 sub_0201CF80: ; 0x0201CF80
@@ -11205,7 +11205,7 @@ _0201DD58:
 	ldrh r1, [r0, #2]
 	tst r1, #1
 	beq _0201DD70
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 _0201DD70:
 	add r0, r6, #1
 	mov r0, r0, lsl #0x10
--- a/asm/main_02029A68.s
+++ b/asm/main_02029A68.s
@@ -90,14 +90,14 @@ _02029B70:
 	strh r1, [r0, #0x1c]
 	ldr r1, [r4, #0xc]
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029BA4:
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
 	strh r1, [r0, #0x1c]
 	ldr r1, [r4, #0xc]
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029BBC:
 	mov r0, r4
@@ -111,14 +111,14 @@ _02029BBC:
 	strh r1, [r0, #0x1c]
 	ldr r1, [r4, #0xc]
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029BF0:
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
 	strh r1, [r0, #0x1c]
 	ldr r1, [r4, #0xc]
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029C08:
 	mov r0, r4
@@ -134,7 +134,7 @@ _02029C08:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #4
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029C44:
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
@@ -143,7 +143,7 @@ _02029C44:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #4
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029C64:
 	ldr r1, _02029EC0 ; =0x0000FFFF
@@ -175,7 +175,7 @@ _02029C64:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #0x10
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _02029EB8 ; =CURSOR_ANIMATION_CONTROL
 	ldrh r1, [r0, #2]
 	bic r1, r1, #0x20
@@ -194,7 +194,7 @@ _02029CF0:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #0x10
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
 	ldrh r1, [r0, #2]
 	bic r1, r1, #0x20
@@ -214,7 +214,7 @@ _02029D38:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #4
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029D74:
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
@@ -223,7 +223,7 @@ _02029D74:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #4
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029EB0
 _02029D94:
 	mov r0, r4
@@ -239,7 +239,7 @@ _02029D94:
 	ldr r1, [r4, #0x14]
 	sub r1, r1, #4
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02029DEC
 _02029DD0:
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
@@ -248,7 +248,7 @@ _02029DD0:
 	ldr r1, [r4, #0x14]
 	sub r1, r1, #4
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 _02029DEC:
 	mov ip, #0
 	ldr r1, _02029EC0 ; =0x0000FFFF
@@ -276,7 +276,7 @@ _02029DEC:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #0x10
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _02029EB8 ; =CURSOR_ANIMATION_CONTROL
 	ldrh r1, [r0, #2]
 	bic r1, r1, #0x20
@@ -295,7 +295,7 @@ _02029E6C:
 	ldr r1, [r4, #0xc]
 	sub r1, r1, #0x10
 	strh r1, [r0, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
 	ldrh r1, [r0, #2]
 	bic r1, r1, #0x20
@@ -428,10 +428,10 @@ sub_02029FE8: ; 0x02029FE8
 	ldr r1, [r1, #4]
 	tst r1, #0x10
 	ldmneia sp!, {r3, pc}
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldmia sp!, {r3, pc}
 _0202A02C:
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0202A034: .word ALERT_ANIMATION_CONTROL
--- a/asm/main_0206A878.s
+++ b/asm/main_0206A878.s
@@ -1286,7 +1286,7 @@ _0206BA14:
 	mov r4, #0x7c
 _0206BA3C:
 	mla r0, r6, r4, r5
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	add r6, r6, #1
 	cmp r6, #7
 	blt _0206BA3C
--- a/asm/overlay_01.s
+++ b/asm/overlay_01.s
@@ -3776,7 +3776,7 @@ _0232C270:
 	strb r1, [r0]
 _0232C294:
 	ldr r0, _0232C2A8 ; =ov01_0233C784
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _0232C2A0: .word ov01_0233C140
@@ -3976,7 +3976,7 @@ _0232C504:
 	strb r1, [r0]
 _0232C528:
 	ldr r0, _0232C53C ; =ov01_0233C880
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _0232C534: .word ov01_0233C144
@@ -9403,11 +9403,11 @@ _02330D94:
 	cmp r0, #0
 	beq _02330DC0
 	add r0, r1, #0x94
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _02330DFC ; =ov01_0233C164
 	ldr r0, [r0]
 	add r0, r0, #0x110
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 _02330DC0:
 	ldr r0, _02330DFC ; =ov01_0233C164
 	ldr r1, [r0]
@@ -9415,14 +9415,14 @@ _02330DC0:
 	cmp r0, #3
 	ldmneia sp!, {r3, pc}
 	add r0, r1, #0x208
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _02330DFC ; =ov01_0233C164
 	ldr r1, [r0]
 	ldr r0, [r1, #0x7c]
 	cmp r0, #0
 	ldmleia sp!, {r3, pc}
 	add r0, r1, #0x18c
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _02330DFC: .word ov01_0233C164
@@ -9629,7 +9629,7 @@ _02331094:
 	ldrh r1, [r0, #2]
 	tst r1, #2
 	ldmneia sp!, {r4, pc}
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 _023310AC: .word ov01_0233C174
--- a/asm/overlay_10_022BCC7C.s
+++ b/asm/overlay_10_022BCC7C.s
@@ -3191,7 +3191,7 @@ _022BF648:
 	strh r7, [r6, #0x86]
 	add r0, r6, #0x68
 	strh r5, [r6, #0xa0]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 _022BF6D4:
 	ldr r0, [r6, #0x18]
 	cmp r0, #0
@@ -5348,7 +5348,7 @@ _022C1178:
 	cmp r5, sb
 	blt _022C1164
 	mov r0, r4
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	add r0, sp, #0x10
 	mov r2, r4
 	mov r1, #4
@@ -5389,7 +5389,7 @@ ov10_022C11D8: ; 0x022C11D8
 	strh r2, [r3, #0x24]
 	add r0, r3, #8
 	strh r1, [r3, #0x26]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	ldr r0, _022C138C ; =ov10_022DC1D0
 	ldr r1, [r0]
 	ldrb r0, [r1, #0x5f4]
@@ -5470,7 +5470,7 @@ _022C12EC:
 	strh r1, [r6, #0x14]
 	strh sl, [r6, #0x1c]
 	strh sb, [r6, #0x1e]
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	mov r2, r6
 	add r0, sp, #0x10
 	mov r1, #4
--- a/asm/overlay_11_022EE5E4.s
+++ b/asm/overlay_11_022EE5E4.s
@@ -9013,7 +9013,7 @@ _022F5768:
 	strh r2, [r5, #0xe]
 	bl FillOamAttributeInfo
 	add r0, r5, #0xc
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	mov r0, #0
 	strb r0, [r5, #0xb6]
 	ldrh r0, [r5, #0x90]
@@ -9049,7 +9049,7 @@ _022F5808:
 	strh r2, [r5, #0xe]
 	bl FillOamAttributeInfo
 	add r0, r5, #0xc
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	mov r0, #0
 	strb r0, [r5, #0xb6]
 	ldrh r0, [r5, #0x90]
@@ -9085,7 +9085,7 @@ _022F5870:
 	strh r2, [r5, #0xe]
 	bl FillOamAttributeInfo
 	add r0, r5, #0xc
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	mov r0, #0
 	strb r0, [r5, #0xb6]
 	ldrh r0, [r5, #0x90]
--- a/asm/overlay_29_022E1640.s
+++ b/asm/overlay_29_022E1640.s
@@ -163,8 +163,8 @@ _022E184C: .word ov29_0237C754
 _022E1850: .word ov29_0237C79C
 	arm_func_end ov29_022E1640

-	arm_func_start ov29_022E1854
-ov29_022E1854: ; 0x022E1854
+	arm_func_start DisplayMonstersAndItems
+DisplayMonstersAndItems: ; 0x022E1854
 #ifdef JAPAN
 #define OV29_022E1854_OFFSET -0xA4
 #else
@@ -197,14 +197,14 @@ _022E1884:
 	cmp r5, r0
 	mov r0, r5
 	bne _022E18C4
-	bl ov29_02303F18
+	bl DisplayMonster
 	b _022E18F0
 _022E18C4:
 	ldr sb, [r5, #0xb4]
-	bl ov29_023046E8
+	bl AnimateFlyingMoves
 	mov r0, r8
 	mov r1, r5
-	bl ov29_022E3A40
+	bl CopyStatusIconFlags
 	str r7, [sp]
 	ldrsh r1, [sb, #4]
 	ldr r0, [sb, #0xb0]
@@ -232,7 +232,7 @@ _022E1908:
 	cmp r0, #1
 	bne _022E196C
 	mov r0, r7
-	bl ov29_02303F18
+	bl DisplayMonster
 	ldr r0, [r7, #0xb4]
 #ifdef JAPAN
 	ldrb r0, [r0, #0x161]
@@ -265,7 +265,7 @@ _022E1980:
 	cmp r0, #0
 	beq _022E19A8
 	mov r0, r6
-	bl ov29_02303F18
+	bl DisplayMonster
 _022E19A8:
 	add r5, r5, #1
 	cmp r5, #0x10
@@ -284,7 +284,7 @@ _022E19CC:
 	mov r1, r8
 	mov r2, r6
 	mov r3, r5
-	bl ov29_023457C8
+	bl DisplayItem
 	add sb, sb, #1
 _022E19F0:
 	ldr r1, [r4]
@@ -294,10 +294,10 @@ _022E19F0:
 	blt _022E19CC
 	cmp r8, #0
 	beq _022E1A10
-	bl ov29_022ED9D0
+	bl CreateTrapAndStairsHallucinations
 _022E1A10:
 	add sp, sp, #0xc
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
 _022E1A18: .word DUNGEON_PTR
-	arm_func_end ov29_022E1854
+	arm_func_end DisplayMonstersAndItems
--- a/asm/overlay_29_022E1AD4.s
+++ b/asm/overlay_29_022E1AD4.s
@@ -839,8 +839,8 @@ ov29_022E2418: ; 0x022E2418
 _022E246C: .word DUNGEON_PTR
 	arm_func_end ov29_022E2418

-	arm_func_start ov29_022E2470
-ov29_022E2470: ; 0x022E2470
+	arm_func_start CreateTemporaryEntity
+CreateTemporaryEntity: ; 0x022E2470
 	mov r1, #6
 	str r1, [r0]
 	mov r1, #0
@@ -851,7 +851,7 @@ ov29_022E2470: ; 0x022E2470
 	strh r1, [r0, #0x26]
 	strb r1, [r0, #0x22]
 	bx lr
-	arm_func_end ov29_022E2470
+	arm_func_end CreateTemporaryEntity

 	arm_func_start ShouldMinimapDisplayEntity
 ShouldMinimapDisplayEntity: ; 0x022E2498
--- a/asm/overlay_29_022E37DC.s
+++ b/asm/overlay_29_022E37DC.s
@@ -191,8 +191,8 @@ _022E3A38: .word DUNGEON_PTR
 _022E3A3C: .word ov29_0235354C
 	arm_func_end AnimationDelayOrSomething

-	arm_func_start ov29_022E3A40
-ov29_022E3A40: ; 0x022E3A40
+	arm_func_start CopyStatusIconFlags
+CopyStatusIconFlags: ; 0x022E3A40
 	ldr r1, [r1, #0xb4]
 #ifdef JAPAN
 	ldr r2, [r1, #0x214]
@@ -204,7 +204,7 @@ ov29_022E3A40: ; 0x022E3A40
 	str r2, [r0]
 	str r1, [r0, #4]
 	bx lr
-	arm_func_end ov29_022E3A40
+	arm_func_end CopyStatusIconFlags

 	arm_func_start ov29_022E3A58
 ov29_022E3A58: ; 0x022E3A58
--- a/asm/overlay_29_022E7EC4.s
+++ b/asm/overlay_29_022E7EC4.s
@@ -1290,8 +1290,8 @@ _022E8E58: .word DUNGEON_PTR
 _022E8E5C: .word TOP_SCREEN_STATUS_PTR
 	arm_func_end ov29_022E8CE8

-	arm_func_start ov29_022E8E60
-ov29_022E8E60: ; 0x022E8E60
+	arm_func_start DrawDungeonControlsText
+DrawDungeonControlsText: ; 0x022E8E60
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	ldr r0, _022E8E90 ; =0x00003FCB
@@ -1312,7 +1312,7 @@ _022E8E90: .word 0x000049CE
 #else
 _022E8E90: .word 0x00003FCB
 #endif
-	arm_func_end ov29_022E8E60
+	arm_func_end DrawDungeonControlsText

 	arm_func_start ov29_022E8E94
 ov29_022E8E94: ; 0x022E8E94
@@ -1334,7 +1334,7 @@ ov29_022E8E94: ; 0x022E8E94
 	add ip, sp, #0
 	ldmia r0, {r0, r1, r2, r3}
 	stmia ip, {r0, r1, r2, r3}
-	ldr r1, _022E8F24 ; =ov29_022E8E60
+	ldr r1, _022E8F24 ; =DrawDungeonControlsText
 	mov r0, ip
 	bl CreateTextBox
 	ldr r1, _022E8F1C ; =ov29_02353558
@@ -1354,7 +1354,7 @@ _022E8F14:
 	.align 2, 0
 _022E8F1C: .word ov29_02353558
 _022E8F20: .word ov29_023515F4
-_022E8F24: .word ov29_022E8E60
+_022E8F24: .word DrawDungeonControlsText
 	arm_func_end ov29_022E8E94

 	arm_func_start ov29_022E8F28
--- a/asm/overlay_29_022E9488.s
+++ b/asm/overlay_29_022E9488.s
@@ -3,8 +3,8 @@

 	.text

-	arm_func_start ov29_022E9488
-ov29_022E9488: ; 0x022E9488
+	arm_func_start DisplayThrownItemShadow
+DisplayThrownItemShadow: ; 0x022E9488
 	stmdb sp!, {r3, r4, r5, lr}
 	ldr ip, _022E955C ; =DUNGEON_PTR
 	ldr r3, _022E9560 ; =0x0001A224
@@ -73,4 +73,4 @@ _022E9570: .word ov29_0237C892
 _022E9574: .word 0xFFFF000F
 _022E9578: .word OBJ_GRAPHICS_CONTROLS_PTR
 _022E957C: .word ov29_0237C888
-	arm_func_end ov29_022E9488
+	arm_func_end DisplayThrownItemShadow
--- a/asm/overlay_29_022E9618.s
+++ b/asm/overlay_29_022E9618.s
@@ -847,7 +847,7 @@ _022EA0DC:
 	bl sub_02051E20
 _022EA0F8:
 	bl ov29_0230473C
-	bl ov29_022E1854
+	bl DisplayMonstersAndItems
 	bl ov29_022E335C
 	ldr r0, _022EA290 ; =DUNGEON_PTR
 	ldr r1, [r0]
--- a/asm/overlay_29_022EBCE8.s
+++ b/asm/overlay_29_022EBCE8.s
@@ -223,7 +223,7 @@ _022EBFC8:
 	bl RunMonsterAi
 	mov r0, r4
 	bl ExecuteMonsterAction
-	bl ov29_022EF9C8
+	bl IsFloorOver2
 	mov r0, r6
 	bl TryForcedLoss
 	mov r0, r4
@@ -337,7 +337,7 @@ _022EC0BC:
 	bne _022EC1C8
 	mov r0, r8
 	bl ExecuteMonsterAction
-	bl ov29_022EF9C8
+	bl IsFloorOver2
 	mov r0, #0
 	bl TryForcedLoss
 	bl IsFloorOver
@@ -416,7 +416,7 @@ _022EC2AC:
 	mov r0, #1
 	mov r1, #0
 	bl TryActivateWeather
-	bl ov29_022EF9C8
+	bl IsFloorOver2
 	mov r0, #0
 	bl TryForcedLoss
 _022EC2C4:
@@ -548,7 +548,7 @@ _022EC434:
 	ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	mov r0, sb
 	bl ExecuteMonsterAction
-	bl ov29_022EF9C8
+	bl IsFloorOver2
 	mov r0, #0
 	bl TryForcedLoss
 	bl IsFloorOver
--- a/asm/overlay_29_022EC62C.s
+++ b/asm/overlay_29_022EC62C.s
@@ -47,7 +47,7 @@ _022EC668:
 	bl RunMonsterAi
 	mov r0, r5
 	bl ExecuteMonsterAction
-	bl ov29_022EF9C8
+	bl IsFloorOver2
 	mov r0, r8
 	bl TryForcedLoss
 _022EC6C8:
--- a/asm/overlay_29_022ECDE4.s
+++ b/asm/overlay_29_022ECDE4.s
@@ -917,8 +917,8 @@ _022ED9C8:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, pc}
 	arm_func_end SpawnEnemyTrapAtPos

-	arm_func_start ov29_022ED9D0
-ov29_022ED9D0: ; 0x022ED9D0
+	arm_func_start CreateTrapAndStairsHallucinations
+CreateTrapAndStairsHallucinations: ; 0x022ED9D0
 #ifdef JAPAN
 #define OV29_022ED9D0_OFFSET -0xA4
 #else
@@ -1060,7 +1060,7 @@ _022EDBC4: .word 0x0000013E
 _022EDBC8: .word ov29_0237C864
 _022EDBCC: .word 0xFFFF000F
 _022EDBD0: .word OBJ_GRAPHICS_CONTROLS_PTR
-	arm_func_end ov29_022ED9D0
+	arm_func_end CreateTrapAndStairsHallucinations

 	arm_func_start PrepareTrapperTrap
 PrepareTrapperTrap: ; 0x022EDBD4
--- a/asm/overlay_29_022EE36C.s
+++ b/asm/overlay_29_022EE36C.s
@@ -888,7 +888,7 @@ ApplyTripTrapEffect: ; 0x022EED2C
 	bl ov29_022EA370
 	mov r0, r5
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, r5
 	mov r1, #0x2c
 	ldr r4, [r5, #0xb4]
--- a/asm/overlay_29_022EF7C4.s
+++ b/asm/overlay_29_022EF7C4.s
@@ -126,8 +126,8 @@ _022EF918:
 _022EF934: .word DUNGEON_PTR
 	arm_func_end ov29_022EF8A4

-	arm_func_start ov29_022EF938
-ov29_022EF938: ; 0x022EF938
+	arm_func_start ChangeTeamAnimationsToIdle
+ChangeTeamAnimationsToIdle: ; 0x022EF938
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	ldr r5, _022EF9B4 ; =DUNGEON_PTR
 	mov r4, #0
@@ -158,11 +158,11 @@ _022EF948:
 	mov r0, r7
 	cmp r1, #0xff
 	beq _022EF994
-	bl ChangeMonsterAnimationToIdle
+	bl MakeMonsterIdleInDirection2
 	b _022EF99C
 _022EF994:
 	mov r1, r6
-	bl ChangeMonsterAnimationToIdle
+	bl MakeMonsterIdleInDirection2
 _022EF99C:
 	add r0, r4, #1
 	mov r0, r0, lsl #0x10
@@ -172,7 +172,7 @@ _022EF99C:
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	.align 2, 0
 _022EF9B4: .word DUNGEON_PTR
-	arm_func_end ov29_022EF938
+	arm_func_end ChangeTeamAnimationsToIdle

 	arm_func_start ov29_022EF9B8
 ov29_022EF9B8: ; 0x022EF9B8
@@ -187,8 +187,8 @@ ov29_022EF9BC: ; 0x022EF9BC
 _022EF9C4: .word ov29_02348F20
 	arm_func_end ov29_022EF9BC

-	arm_func_start ov29_022EF9C8
-ov29_022EF9C8: ; 0x022EF9C8
+	arm_func_start IsFloorOver2
+IsFloorOver2: ; 0x022EF9C8
 	stmdb sp!, {r3, lr}
 	bl IsFloorOver
 	cmp r0, #0
@@ -199,4 +199,4 @@ ov29_022EF9C8: ; 0x022EF9C8
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _022EF9E8: .word DUNGEON_PTR
-	arm_func_end ov29_022EF9C8
+	arm_func_end IsFloorOver2
--- a/asm/overlay_29_022F05B4.s
+++ b/asm/overlay_29_022F05B4.s
@@ -74,7 +74,7 @@ MakeTargetFaceUserAndIdle: ; 0x022F0654
 	mov r1, r0
 	mov r0, r4
 	and r1, r1, #0xff
-	bl ChangeMonsterAnimationToIdle
+	bl MakeMonsterIdleInDirection2
 	ldmia sp!, {r4, pc}
 	arm_func_end MakeTargetFaceUserAndIdle

@@ -211,7 +211,7 @@ _022F07E8:
 	beq _022F082C
 	mov r0, r7
 	mov r1, r4
-	bl ChangeMonsterAnimationToIdle
+	bl MakeMonsterIdleInDirection2
 	mov r0, r7
 	bl UpdateAiTargetPos
 _022F082C:
@@ -2388,7 +2388,7 @@ _022F25D8:
 	beq _022F2748
 	ldr r0, [sp, #0x14]
 	add r1, r6, #4
-	bl ov29_022FF958
+	bl CannotStandOnTile__02300384
 	cmp r0, #0
 	beq _022F26B8
 	mov r0, #0
@@ -4415,7 +4415,7 @@ ov29_022F426C: ; 0x022F426C
 	ldmneia sp!, {r4, r5, r6, pc}
 	mov r0, r6
 	mov r1, r5
-	bl ov29_022FF958
+	bl CannotStandOnTile__02300384
 	cmp r0, #0
 	movne r0, #0
 	ldmneia sp!, {r4, r5, r6, pc}
--- a/asm/overlay_29_022F52B0.s
+++ b/asm/overlay_29_022F52B0.s
@@ -504,7 +504,7 @@ _022F5928:
 	add r1, sp, #0xc
 	mov r0, sb
 	add r2, sb, #4
-	bl ov29_02347518
+	bl HandleRegularProjectileThrow
 _022F5944:
 	mov r0, sb
 	bl EntityIsValid__022F528C
@@ -512,7 +512,7 @@ _022F5944:
 	beq _022F5978
 	ldrb r1, [r8, #0x4c]
 	mov r0, sb
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	ldr r1, _022F5990 ; =DUNGEON_PTR
 	mov r0, sb
 	ldr r1, [r1]
--- a/asm/overlay_29_022F59C4.s
+++ b/asm/overlay_29_022F59C4.s
@@ -145,7 +145,7 @@ _022F5B4C:
 	bl GetDirectionTowardsPosition
 	mov r1, r0
 	mov r0, r6
-	bl ov29_02304AFC
+	bl MakeMonsterIdleInDirection
 	ldr r1, _022F5DA0 ; =0x00000BC2
 	mov r0, #0
 	mov r2, #1
@@ -157,18 +157,18 @@ _022F5B78:
 	bl GetDirectionTowardsPosition
 	mov r1, r0
 	mov r0, r6
-	bl ov29_02304AFC
+	bl MakeMonsterIdleInDirection
 	cmp r5, #0
 	blt _022F5BA8
 	mov r0, sl
 	mov r1, r5
-	bl ov29_02304AFC
+	bl MakeMonsterIdleInDirection
 	b _022F5BB8
 _022F5BA8:
 	ldrb r1, [r8, #0x4c]
 	mov r0, sl
 	add r1, r1, #4
-	bl ov29_02304AFC
+	bl MakeMonsterIdleInDirection
 _022F5BB8:
 	cmp r4, #0
 	beq _022F5BD0
--- a/asm/overlay_29_022F62CC.s
+++ b/asm/overlay_29_022F62CC.s
@@ -102,7 +102,7 @@ _022F63D8:
 	bl GetDirectionTowardsPosition
 	mov r1, r0
 	mov r0, r5
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _022F6434:
 	ldr r1, _022F6700 ; =0x00000E53
 	add r0, sp, #0x18
@@ -237,7 +237,7 @@ _022F65F8:
 	bl GetDirectionTowardsPosition
 	mov r1, r0
 	mov r0, sl
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	b _022F6620
 _022F6614:
 	add r8, r8, #1
@@ -296,7 +296,7 @@ _022F66A8:
 	bl GetDirectionTowardsPosition
 	mov r1, r0
 	mov r0, r5
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _022F66E4:
 	ldr r1, _022F6708 ; =0x00000E52
 	add r0, sp, #0x18
--- a/asm/overlay_29_022F7768.s
+++ b/asm/overlay_29_022F7768.s
@@ -672,7 +672,7 @@ HandleFaint: ; 0x022F7F30
 #endif
 	bne _022F7F64
 	add r0, sp, #4
-	bl ov29_022E2470
+	bl CreateTemporaryEntity
 	add r8, sp, #4
 _022F7F64:
 	ldr r0, [r4, #0xc]
--- a/asm/overlay_29_022F9744.s
+++ b/asm/overlay_29_022F9744.s
@@ -966,7 +966,7 @@ _022FA2B8:
 	cmp r5, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
 	mov r0, r6
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
 _022FA2E8: .word DIRECTIONS_XY
@@ -1012,8 +1012,8 @@ _022FA34C:
 _022FA35C: .word DUNGEON_PTR
 	arm_func_end ov29_022FA2F0

-	arm_func_start ChangeMonsterAnimationToIdle
-ChangeMonsterAnimationToIdle: ; 0x022FA360
+	arm_func_start MakeMonsterIdleInDirection2
+MakeMonsterIdleInDirection2: ; 0x022FA360
 	stmdb sp!, {r4, r5, r6, lr}
 	mov r6, r0
 	mov r5, r1
@@ -1030,7 +1030,7 @@ ChangeMonsterAnimationToIdle: ; 0x022FA360
 	mov r0, r6
 	bl ChangeMonsterAnimation
 	ldmia sp!, {r4, r5, r6, pc}
-	arm_func_end ChangeMonsterAnimationToIdle
+	arm_func_end MakeMonsterIdleInDirection2

 	arm_func_start ov29_022FA3A0
 ov29_022FA3A0: ; 0x022FA3A0
@@ -1045,7 +1045,7 @@ ov29_022FA3A0: ; 0x022FA3A0
 	bl GetDirectionTowardsPosition
 	and r1, r0, #0xff
 	mov r0, r5
-	bl ChangeMonsterAnimationToIdle
+	bl MakeMonsterIdleInDirection2
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end ov29_022FA3A0

@@ -1082,6 +1082,6 @@ ov29_022FA418: ; 0x022FA418
 	bl IsFullFloorFixedRoom
 	cmp r0, #0
 	ldmeqia sp!, {r3, pc}
-	bl ov29_022EF938
+	bl ChangeTeamAnimationsToIdle
 	ldmia sp!, {r3, pc}
 	arm_func_end ov29_022FA418
--- a/asm/overlay_29_022FA524.s
+++ b/asm/overlay_29_022FA524.s
@@ -24,7 +24,7 @@ _022FA530:
 	ldr r1, [r6, #0xb4]
 	mov r0, r6
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _022FA560:
 	add r5, r5, #1
 	cmp r5, #0x14
--- a/asm/overlay_29_022FC9C0.s
+++ b/asm/overlay_29_022FC9C0.s
@@ -682,7 +682,7 @@ _022FD278:
 	bl InflictSleepStatusSingle
 	mov r0, r4
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _022FD2F4:
 	mov r0, r4
 _022FD2F8:
--- 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
+	bl CannotStandOnTile__023006C8
 	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
+	bl CannotStandOnTile__023006C8
 	cmp r0, #0
 	beq _022FED58
 	ldr r0, [r6, #0x110 + EXECUTE_MONSTER_ACTION_OFFSET]
--- a/asm/overlay_29_022FF958.s
+++ b/asm/overlay_29_022FF958.s
@@ -3,8 +3,8 @@

 	.text

-	arm_func_start ov29_022FF958
-ov29_022FF958: ; 0x022FF958
+	arm_func_start CannotStandOnTile__02300384
+CannotStandOnTile__02300384: ; 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 ov29_022FF958
+	arm_func_end CannotStandOnTile__02300384

 	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
-CannotStandOnTile: ; 0x022FFC9C
+	arm_func_start CannotStandOnTile__023006C8
+CannotStandOnTile__023006C8: ; 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
+	arm_func_end CannotStandOnTile__023006C8

 	arm_func_start CalcSpeedStage
 CalcSpeedStage: ; 0x022FFDF4
--- a/asm/overlay_29_023026FC.s
+++ b/asm/overlay_29_023026FC.s
@@ -31,7 +31,7 @@ EnemyEvolution: ; 0x023026FC
 	cmp r0, #0
 	bne _02302758
 	add r0, sp, #0xb0
-	bl ov29_022E2470
+	bl CreateTemporaryEntity
 	add sl, sp, #0xb0
 _02302758:
 	ldr r0, _02302A2C ; =ov29_023527F8
--- a/asm/overlay_29_02302A5C.s
+++ b/asm/overlay_29_02302A5C.s
@@ -1573,8 +1573,8 @@ _02303F10: .word 0xFFFF000F
 _02303F14: .word OBJ_GRAPHICS_CONTROLS_PTR
 	arm_func_end DisplayMonsterShadow

-	arm_func_start ov29_02303F18
-ov29_02303F18: ; 0x02303F18
+	arm_func_start DisplayMonster
+DisplayMonster: ; 0x02303F18
 #ifdef JAPAN
 #define OV29_02303F18_OFFSET -4
 #define OV29_02303F18_OFFSET_2 -0xA4
@@ -1884,7 +1884,7 @@ _02304310:
 	bl ov29_022DDB98
 	add r0, sp, #0x10
 	mov r1, r7
-	bl ov29_022E3A40
+	bl CopyStatusIconFlags
 	cmp r4, #0
 	ldrneb r0, [r5, #0x156 + OV29_02303F18_OFFSET]
 	cmpne r0, #0
@@ -1901,7 +1901,7 @@ _02304310:
 	mov r1, sl
 	bl ov29_022E6E80
 	mov r0, r7
-	bl ov29_023046E8
+	bl AnimateFlyingMoves
 	cmp r4, #0
 	beq _0230464C
 	ldr r0, [r7, #0xb4]
@@ -2016,7 +2016,7 @@ _02304558:
 	cmp r0, #0
 	bne _02304570
 	add r0, r7, #0x2c
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 	b _02304590
 _02304570:
 	cmp r0, #1
@@ -2026,7 +2026,7 @@ _02304570:
 	tst r0, #1
 	beq _02304590
 	add r0, r7, #0x2c
-	bl sub_0201CF5C
+	bl DisplayAndSwitchAnimationControlCurrentFrame
 _02304590:
 	ldrsh r2, [r7, #0x50]
 	add r1, r5, #0x100
@@ -2120,10 +2120,10 @@ _023046D8: .word DUNGEON_FRAMES_PASSED
 _023046DC: .word ov29_0235280C
 _023046E0: .word 0x0000F3FF
 _023046E4: .word 0xFFFFFE5D
-	arm_func_end ov29_02303F18
+	arm_func_end DisplayMonster

-	arm_func_start ov29_023046E8
-ov29_023046E8: ; 0x023046E8
+	arm_func_start AnimateFlyingMoves
+AnimateFlyingMoves: ; 0x023046E8
 #ifdef JAPAN
 #define OV29_023046E8_OFFSET -4
 #else
@@ -2155,7 +2155,7 @@ _02304728:
 	movmi r0, #0
 	strmi r0, [r1, #0x188 + OV29_023046E8_OFFSET]
 	bx lr
-	arm_func_end ov29_023046E8
+	arm_func_end AnimateFlyingMoves

 	arm_func_start ov29_0230473C
 ov29_0230473C: ; 0x0230473C
--- a/asm/overlay_29_023047DC.s
+++ b/asm/overlay_29_023047DC.s
@@ -205,8 +205,8 @@ ov29_02304A00: ; 0x02304A00
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end ov29_02304A00

-	arm_func_start ov29_02304A48
-ov29_02304A48: ; 0x02304A48
+	arm_func_start ChangeMonsterAnimationToIdle
+ChangeMonsterAnimationToIdle: ; 0x02304A48
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	ldr r2, [r5]
@@ -222,10 +222,10 @@ ov29_02304A48: ; 0x02304A48
 	cmp r4, #8
 	strltb r4, [r5, #0xb0]
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov29_02304A48
+	arm_func_end ChangeMonsterAnimationToIdle

-	arm_func_start ov29_02304A84
-ov29_02304A84: ; 0x02304A84
+	arm_func_start ChangeMonsterAnimationToHurt
+ChangeMonsterAnimationToHurt: ; 0x02304A84
 	ldr r2, [r0]
 	cmp r2, #1
 	bxne lr
@@ -238,7 +238,7 @@ ov29_02304A84: ; 0x02304A84
 	cmp r1, #8
 	strltb r1, [r0, #0xb0]
 	bx lr
-	arm_func_end ov29_02304A84
+	arm_func_end ChangeMonsterAnimationToHurt

 	arm_func_start GetIdleAnimationId
 GetIdleAnimationId: ; 0x02304AB4
@@ -263,16 +263,16 @@ _02304AE8:
 	bx lr
 	arm_func_end GetIdleAnimationId

-	arm_func_start ov29_02304AFC
-ov29_02304AFC: ; 0x02304AFC
+	arm_func_start MakeMonsterIdleInDirection
+MakeMonsterIdleInDirection: ; 0x02304AFC
 	ldr r2, [r0, #0xb4]
 	and r1, r1, #7
-	ldr ip, _02304B10 ; =ov29_02304A48
+	ldr ip, _02304B10 ; =ChangeMonsterAnimationToIdle
 	strb r1, [r2, #0x4c]
 	bx ip
 	.align 2, 0
-_02304B10: .word ov29_02304A48
-	arm_func_end ov29_02304AFC
+_02304B10: .word ChangeMonsterAnimationToIdle
+	arm_func_end MakeMonsterIdleInDirection

 	arm_func_start ov29_02304B14
 ov29_02304B14: ; 0x02304B14
@@ -405,7 +405,7 @@ ov29_02304C3C: ; 0x02304C3C
 _02304C8C:
 	mov r0, r4
 	mov r1, r8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, r6
 	mov r1, r5
 	bl ov29_022EA370
@@ -425,7 +425,7 @@ _02304CC0:
 _02304CD4:
 	mov r0, r4
 	mov r1, r8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, r6
 	mov r1, r5
 	bl ov29_022EA370
@@ -438,7 +438,7 @@ _02304CFC:
 	bne _02304CD4
 	mov r0, r4
 	mov r1, r8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, #2
 	mov r1, #0x43
 	bl ov29_022EA370
@@ -712,7 +712,7 @@ _023050C0:
 	cmp r1, r0
 	beq _02305160
 	mov r0, r8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	b _02305160
 _023050EC:
 	ldrh r2, [sb]
@@ -1013,7 +1013,7 @@ _02305538:
 	add r8, r8, #1
 	cmp r8, #2
 	blt _02305390
-	bl ov29_022EF9C8
+	bl IsFloorOver2
 	bl IsFloorOver
 	cmp r0, #0
 	ldrne r1, _02305588 ; =DUNGEON_PTR
--- a/asm/overlay_29_02305C28.s
+++ b/asm/overlay_29_02305C28.s
@@ -413,7 +413,7 @@ _02306164:
 	ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
 	mov r0, r8
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
 	.align 2, 0
 #ifdef JAPAN
@@ -1521,7 +1521,7 @@ _02306EBC:
 	beq _02306EE4
 	mov r0, sb
 	mov r1, #0x378
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _02306EE4:
 	mov r0, sb
 	bl UpdateStatusIconFlags
--- a/asm/overlay_29_02308FE0.s
+++ b/asm/overlay_29_02308FE0.s
@@ -744,7 +744,7 @@ _0230A47C:
 	beq _0230A4A4
 	mov r0, sb
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _0230A4A4:
 	ldr r0, [r5, #4]
 	cmp r0, #0xe
@@ -1850,7 +1850,7 @@ _02309A50:
 	beq _02309A78
 	mov r0, r7
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _02309A78:
 	ldr r0, [r6, #4]
 	cmp r0, #0xe
--- a/asm/overlay_29_0230BBAC.s
+++ b/asm/overlay_29_0230BBAC.s
@@ -1497,7 +1497,7 @@ ApplyDamageAndEffectsWrapper: ; 0x0230D11C
 	mov r4, r3
 	bl ResetDamageData
 	add r0, sp, #0x24
-	bl ov29_022E2470
+	bl CreateTemporaryEntity
 	mov r3, #0
 	mov r0, #2
 	str r0, [sp, #0x18]
--- a/asm/overlay_29_0230E064.s
+++ b/asm/overlay_29_0230E064.s
@@ -40,7 +40,7 @@ TryRecruit: ; 0x0230E064
 	bl ov29_02305F60
 	mov r1, r6
 	mov r0, sb
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	ldrsh r0, [r4, #2]
 	mov r1, #1
 	bl IsMonsterOnTeam
--- a/asm/overlay_29_023118D8.s
+++ b/asm/overlay_29_023118D8.s
@@ -46,7 +46,7 @@ _02311954:
 	mov r4, r0
 	mov r0, r6
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	cmp r4, #1
 	bne _02311994
 	ldr r2, _023119D8 ; =0x00000D06
--- a/asm/overlay_29_02311C28.s
+++ b/asm/overlay_29_02311C28.s
@@ -64,7 +64,7 @@ _02311CE4:
 	mov r0, r6
 	mov r1, #8
 	strb r2, [r5, #0xbd]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	cmp r4, #0
 	beq _02311D14
 	ldr r2, _02311D54 ; =0x00000D0D
@@ -154,7 +154,7 @@ _02311E00:
 	mov r0, r7
 	mov r1, #8
 	strb r2, [r5, #0xbd]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	cmp r4, #0
 	beq _02311E30
 	ldr r2, _02311E64 ; =0x00000D08
@@ -215,7 +215,7 @@ TryInflictYawningStatus: ; 0x02311E70
 	bl ov29_022E53EC
 	mov r0, r5
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	ldr r2, _02311F74 ; =0x00000D0F
 	mov r0, r6
 	mov r1, r5
@@ -324,7 +324,7 @@ TryInflictSleeplessStatus: ; 0x02311F80
 	bl ov29_022E4BB4
 	mov r0, r6
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	cmp r4, #0
 	beq _0231202C
 	ldr r2, _02312060 ; =0x00000D13
@@ -934,7 +934,7 @@ _02312798:
 	bl LogMessageByIdWithPopupCheckUserTarget
 	mov r0, sb
 	mov r1, #8
-	bl ov29_02304A84
+	bl ChangeMonsterAnimationToHurt
 	mov r0, sl
 	mov r1, sb
 	bl TryActivateQuickFeet
@@ -1140,7 +1140,7 @@ _02312A70:
 	bl LogMessageByIdWithPopupCheckUserTarget
 	mov r0, sb
 	mov r1, #8
-	bl ov29_02304A84
+	bl ChangeMonsterAnimationToHurt
 	mov r0, sl
 	mov r1, sb
 	bl TryActivateQuickFeet
@@ -1452,7 +1452,7 @@ _02312ECC:
 	bl LogMessageByIdWithPopupCheckUserTarget
 	mov r0, r6
 	mov r1, #8
-	bl ov29_02304A84
+	bl ChangeMonsterAnimationToHurt
 	mov r0, r7
 	mov r1, r6
 	bl TryActivateQuickFeet
@@ -1579,7 +1579,7 @@ _02313084:
 	bl LogMessageByIdWithPopupCheckUserTarget
 	mov r0, r5
 	mov r1, #8
-	bl ov29_02304A84
+	bl ChangeMonsterAnimationToHurt
 	mov r0, r6
 	mov r1, r5
 	bl TryActivateQuickFeet
@@ -1747,7 +1747,7 @@ TryInflictWrappedStatus: ; 0x023131F4
 	bl LogMessageByIdWithPopupCheckUserTarget
 	mov r0, r6
 	mov r1, #8
-	bl ov29_02304A84
+	bl ChangeMonsterAnimationToHurt
 	mov r0, r7
 	mov r1, r6
 	bl TryActivateQuickFeet
--- a/asm/overlay_29_0231EDFC.s
+++ b/asm/overlay_29_0231EDFC.s
@@ -482,7 +482,7 @@ _0231F4B4:
 	ldr r1, [r7, #0xb4]
 	mov r0, r7
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _0231F4D4:
 	mov r3, #0
 	str r3, [sp]
@@ -504,7 +504,7 @@ _0231F4D4:
 	ldr r1, [r4, #0xb4]
 	mov r0, r4
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _0231F528:
 	mov r0, #0x1e
 	mov r1, #0x3b
--- a/asm/overlay_29_0231F594.s
+++ b/asm/overlay_29_0231F594.s
@@ -418,7 +418,7 @@ _0231FA9C:
 	ldr r1, [sp, #8]
 	add r0, r4, fp
 	mov r2, #0
-	bl ov29_023457C8
+	bl DisplayItem
 _0231FB08:
 	add sb, sb, #1
 _0231FB0C:
--- a/asm/overlay_29_02320788.s
+++ b/asm/overlay_29_02320788.s
@@ -537,7 +537,7 @@ _02320E60:
 	mov r0, r8
 	mov r1, sl
 	strb sl, [r5, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _02320E98:
 	mov r0, #0x22
 	bl AdvanceFrame
@@ -686,7 +686,7 @@ _0232105C:
 	mov r0, r8
 	mov r1, sl
 	strb sl, [r5, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _02321094:
 	mov r0, fp
 	bl AdvanceFrame
@@ -732,7 +732,7 @@ EnsureCanStandCurrentTile: ; 0x02321104
 	stmdb sp!, {r4, lr}
 	mov r4, r0
 	add r1, r4, #4
-	bl CannotStandOnTile
+	bl CannotStandOnTile__023006C8
 	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 ov29_022FF958
+	bl CannotStandOnTile__02300384
 	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
+	bl CannotStandOnTile__023006C8
 	cmp r0, #0
 	ldmeqia sp!, {r3, r4, r5, pc}
 	mov r0, r5
@@ -796,7 +796,7 @@ _023211C4:
 	beq _023211E0
 	mov r0, r4
 	mov r1, #8
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _023211E0:
 	ldr r0, [r4, #0xb4]
 	ldrb r0, [r0, #7]
--- a/asm/overlay_29_02322DDC.s
+++ b/asm/overlay_29_02322DDC.s
@@ -105,7 +105,7 @@ _02322F24:
 	ldr r1, [sl, #0xb4]
 	mov r0, sl
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, #1
 	bl AnimationDelayOrSomething
 _02322F4C:
@@ -117,7 +117,7 @@ _02322F5C:
 	ldr r1, [sl, #0xb4]
 	mov r0, sl
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _02322F6C:
 	mov r0, r4
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
--- a/asm/overlay_29_02324BE8.s
+++ b/asm/overlay_29_02324BE8.s
@@ -654,7 +654,7 @@ _02325480:
 	ldr r1, [r6, #0xb4]
 	mov r0, r6
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, #0
 	strb r0, [r6, #0x28]
 _023254C8:
--- a/asm/overlay_29_0232E864.s
+++ b/asm/overlay_29_0232E864.s
@@ -278,7 +278,7 @@ _0232EC0C:
 _0232EC24:
 	mov r0, r4
 	mov r1, r5
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, #2
 	mov r1, #0x43
 	bl ov29_022EA370
@@ -293,7 +293,7 @@ _0232EC24:
 _0232EC5C:
 	mov r0, r4
 	mov r1, r5
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, #2
 	mov r1, #0x43
 	bl ov29_022EA370
@@ -305,7 +305,7 @@ _0232EC7C:
 	bne _0232EC5C
 	mov r1, r5
 	mov r0, r4
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	mov r0, #2
 	mov r1, #0x43
 	bl ov29_022EA370
@@ -4496,7 +4496,7 @@ _02332738:
 	mov r1, r0
 	ldr r1, [r1, #0xb4]
 	ldrb r1, [r1, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 _0233275C:
 	cmp sl, #0
 	bne _02332790
--- a/asm/overlay_29_02332A70.s
+++ b/asm/overlay_29_02332A70.s
@@ -453,6 +453,6 @@ ov29_02333044: ; 0x02333044
 	and r2, r1, #7
 	mov r0, r5
 	strb r2, [r4, #0x4c]
-	bl ov29_02304A48
+	bl ChangeMonsterAnimationToIdle
 	ldmia sp!, {r3, r4, r5, pc}
 	arm_func_end ov29_02333044
--- 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 ov29_022FF958
+	bl CannotStandOnTile__02300384
 	cmp r0, #0
 	bne _023375DC
 	ldr r0, [sp, #0x20]
@@ -1365,7 +1365,7 @@ _0233762C:
 _023376A8:
 	ldr r0, [sp, #0x20]
 	add r1, sp, #0x28
-	bl ov29_022FF958
+	bl CannotStandOnTile__02300384
 	cmp r0, #0
 	bne _0233772C
 	ldr r0, [sp, #0x20]
--- a/asm/overlay_29_023456BC.s
+++ b/asm/overlay_29_023456BC.s
@@ -86,8 +86,8 @@ _02345784:
 _023457C4: .word DUNGEON_PTR
 	arm_func_end RemoveGroundItem

-	arm_func_start ov29_023457C8
-ov29_023457C8: ; 0x023457C8
+	arm_func_start DisplayItem
+DisplayItem: ; 0x023457C8
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
 	mov r7, r0
 	mov r6, r1
@@ -259,7 +259,7 @@ _02345A2C: .word ov29_023537BC
 _02345A30: .word ov29_023537B4
 _02345A34: .word 0xFFFF000F
 _02345A38: .word OBJ_GRAPHICS_CONTROLS_PTR
-	arm_func_end ov29_023457C8
+	arm_func_end DisplayItem

 	arm_func_start SpawnDroppedItemWrapper
 SpawnDroppedItemWrapper: ; 0x02345A3C
@@ -605,7 +605,7 @@ _02345EE0:
 	mov r1, fp
 	mov r3, r2
 	str r2, [sp]
-	bl ov29_023457C8
+	bl DisplayItem
 	mov r0, #0x13
 	bl AdvanceFrame
 	add r6, r6, #1
@@ -621,7 +621,7 @@ _02345EE0:
 	mov r1, fp
 	mov r3, r2
 	str r2, [sp]
-	bl ov29_023457C8
+	bl DisplayItem
 	mov r0, #0x13
 	bl AdvanceFrame
 	ldr r1, [sp, #4]
@@ -1171,7 +1171,7 @@ _0234665C:
 	str r1, [sp]
 	ldr r1, [sp, #0x10]
 	mov r2, #1
-	bl ov29_023457C8
+	bl DisplayItem
 _023466E0:
 	add r8, r8, #1
 _023466E4:
--- a/asm/overlay_29_02346834.s
+++ b/asm/overlay_29_02346834.s
@@ -1079,7 +1079,7 @@ _0234744C:
 	mov r1, fp
 	mov r2, #0
 	and r3, r6, #0xff
-	bl ov29_023457C8
+	bl DisplayItem
 	mov r0, #0x13
 	bl AdvanceFrame
 	tst r5, #3
@@ -1103,7 +1103,7 @@ _023474CC:
 	mov r2, #1
 	mov r3, #0xff
 	str r5, [sp]
-	bl ov29_023457C8
+	bl DisplayItem
 _02347504:
 	mov r0, #0x13
 	bl AdvanceFrame
@@ -1113,8 +1113,8 @@ _02347504:
 _02347514: .word DUNGEON_PTR
 	arm_func_end ov29_02347378

-	arm_func_start ov29_02347518
-ov29_02347518: ; 0x02347518
+	arm_func_start HandleRegularProjectileThrow
+HandleRegularProjectileThrow: ; 0x02347518
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	sub sp, sp, #0x248
 	ldr r4, _02347B3C ; =DUNGEON_PTR
@@ -1359,7 +1359,7 @@ _02347750:
 	moveq r2, #0
 	add r0, r0, #8
 	add r1, r1, #0x10
-	bl ov29_022E9488
+	bl DisplayThrownItemShadow
 	cmp r0, #0
 	movne r0, #1
 	strne r0, [sp, #0x18]
@@ -1373,7 +1373,7 @@ _02347750:
 #endif
 	add r0, r4, #0xcc
 	mov r2, #0
-	bl ov29_023457C8
+	bl DisplayItem
 	cmp r0, #0
 	movne r0, #1
 	strne r0, [sp, #0x18]
@@ -1785,4 +1785,4 @@ _02347B4C: .word 0x00000924
 _02347B48: .word 0x00000BE1
 _02347B4C: .word 0x00000BE5
 #endif
-	arm_func_end ov29_02347518
+	arm_func_end HandleRegularProjectileThrow
--- a/src/dungeon_projectile_throw.c
+++ b/src/dungeon_projectile_throw.c
@@ -25,14 +25,14 @@ extern struct dungeon *DUNGEON_PTR[];
 extern bool8 ov29_022E2CA0(struct position *pos);
 extern void ov29_0234B4CC(bool8 val);
 extern s32 SinAbs4096(s32 x);
-extern bool8 ov29_022E9488(s32 inX, s32 inY, u8 index);
-extern bool8 ov29_023457C8(struct entity *entity, bool8 hallucinating, u8 a2, u8 a3, u8 a4);
+extern bool8 DisplayThrownItemShadow(s32 inX, s32 inY, u8 index);
+extern bool8 DisplayItem(struct entity *entity, bool8 hallucinating, u8 a2, u8 a3, u8 a4);
 extern void AdvanceFrame(u32);
 extern bool8 TwoTurnMoveForcedMiss(struct entity *target, struct move *move);
 extern bool8 DoesProjectileHitTarget(struct entity *user, struct entity *target);
 extern void PrepareItemForPrinting__02345754(u8 *buffer, struct item *item);
 extern void SubstitutePlaceholderStringTags(u8 *string_id, struct entity *entity, u32 param_3);
-extern void ov29_02304A84(struct entity *entity, u32 new_dir);
+extern void ChangeMonsterAnimationToHurt(struct entity *entity, u32 new_dir);
 extern void LogMessageByIdWithPopupCheckUserTarget(struct entity *user, struct entity *target, u32 message_id);
 extern bool8 TryEndPetrifiedOrSleepStatus(struct entity *user, struct entity *target);
 extern void ApplyItemEffect(char param_1, u8 param_2, u8 param_3, struct entity *attacker, struct entity *defender, struct item *thrown_item);
@@ -155,9 +155,9 @@ void HandleCurvedProjectileThrow(struct entity *user, struct item *item, struct
            if (IsWaterTileset()) terrainArg = 3;
            else terrainArg = 0;

-            if (ov29_022E9488(unkX, unkY, terrainArg))
+            if (DisplayThrownItemShadow(unkX, unkY, terrainArg))
                runFrameActions = TRUE;
-            if (ov29_023457C8(projectile, hallucinating, 0, 0xFF, 1))
+            if (DisplayItem(projectile, hallucinating, 0, 0xFF, 1))
                runFrameActions = TRUE;

            if (runFrameActions)
@@ -199,7 +199,7 @@ void HandleCurvedProjectileThrow(struct entity *user, struct item *item, struct
            if (hitResult.did_hit) {
                bool8 immobiSlpEndMsg;

-                ov29_02304A84(hitResult.target, 8);
+                ChangeMonsterAnimationToHurt(hitResult.target, 8);
                LogMessageByIdWithPopupCheckUserTarget(user, hitResult.target, CURVED_PROJECTILE_LOG_MESSAGE_1);
                immobiSlpEndMsg = TryEndPetrifiedOrSleepStatus(user, hitResult.target);
                ApplyItemEffect(1, (lockOnSpecs || projectile_throw_info->unk0 != 0) ? 1 : 0, immobiSlpEndMsg, user, hitResult.target, item);