Synced from pmdsky-debug

2026-08-25 03:55:29 -05:00 · 2026-04-22 23:30:32 -04:00
parent 269db969b9
commit c5c18e9e82
60 changed files with 231 additions and 231 deletions
--- a/asm/include/main_0202676C.inc
+++ b/asm/include/main_0202676C.inc
@@ -109,6 +109,7 @@
 .public FileRom_InitDataTransfer
 .public FileRom_StopDataTransfer
 .public FileRom_Veneer_FileInit
+.public FillOamAttributeInfo
 .public GetHeldButtons
 .public GetPressedButtons
 .public GetReleasedStylus
@@ -163,7 +164,6 @@
 .public sub_0201C028
 .public sub_0201C108
 .public sub_0201CF5C
-.public sub_0201D110
 .public sub_0201D9C8
 .public sub_0201E12C
 .public sub_0201F2A0
--- a/asm/include/main_0205CA40.inc
+++ b/asm/include/main_0205CA40.inc
@@ -1,11 +1,4 @@
 #pragma once
-.public Debug_Print0
-.public GetBaseForm
-.public GetMaxItemsAllowed
-.public IsItemValidVeneer
-.public IsMonsterIllegalForMissions
-.public IsMonsterMissionAllowed
-.public IsStorableItem
 .public _020A3728
 .public _020A373C
 .public _020A3764
@@ -23,6 +16,13 @@
 .public _020A3918
 .public _020A3954
 .public _020A3984
+.public Debug_Print0
+.public GetBaseForm
+.public GetMaxItemsAllowed
+.public IsItemValidVeneer
+.public IsMonsterIllegalForMissions
+.public IsMonsterMissionAllowed
+.public IsStorableItem
 .public sub_0205CF58
 .public sub_0205D008
 .public sub_0205D11C
--- a/asm/include/overlay_01.inc
+++ b/asm/include/overlay_01.inc
@@ -39,6 +39,7 @@
 .public DrawTextInWindow
 .public EnableIrqFlag
 .public FemaleToMaleForm
+.public FillOamAttributeInfo
 .public GetAdvancedMenuCurrentOption
 .public GetAdvancedMenuResult
 .public GetAdventureLogCompleted
@@ -287,7 +288,6 @@
 .public sub_0201C000
 .public sub_0201C138
 .public sub_0201CF5C
-.public sub_0201D110
 .public sub_0201D12C
 .public sub_0202065C
 .public sub_0202380C_EU
--- a/asm/include/overlay_10_022BCC7C.inc
+++ b/asm/include/overlay_10_022BCC7C.inc
@@ -15,6 +15,7 @@
 .public DirectoryFileMngr_GetDirectoryFileSize
 .public DrawTextInWindow
 .public EFFECT_ANIMATION_INFO
+.public FillOamAttributeInfo
 .public GendersEqual
 .public GetBgRegionArea
 .public GetBodySize
@@ -87,7 +88,6 @@
 .public ov11_02306C64
 .public ov11_02306C9C
 .public ov29_022DD83C
-.public ov29_022EA428
 .public ov29_0234C584
 .public ov29_0234C5EC
 .public PlaySeByIdVolumeWrapper
@@ -117,7 +117,6 @@
 .public sub_0201CF80
 .public sub_0201D034
 .public sub_0201D0F8
-.public sub_0201D110
 .public sub_0201D12C
 .public sub_0201D198
 .public sub_0201D1B0
@@ -177,6 +176,7 @@
 .public SwitchAnimationControlToNextFrame
 .public TEAM_MEMBER_TABLE_PTR
 .public TRAP_ANIMATION_INFO
+.public UnkMapRelatedFunc
 .public UpdateWindow
 .public vsprintf
 .public WAN_TABLE
--- a/asm/include/overlay_11_022EE5E4.inc
+++ b/asm/include/overlay_11_022EE5E4.inc
@@ -64,6 +64,7 @@
 .public EuclideanNorm__020050B0
 .public EVENTS
 .public FemaleToMaleForm
+.public FillOamAttributeInfo
 .public FuncThatCallsRunNextOpcode
 .public FX_Atan2Idx
 .public GetAcceptedMission
@@ -836,7 +837,6 @@
 .public sub_0201CF5C
 .public sub_0201CF90
 .public sub_0201D100
-.public sub_0201D110
 .public sub_0201D18C
 .public sub_0201D1B0
 .public sub_0201DF38
--- a/asm/include/overlay_29_022DEBA4.inc
+++ b/asm/include/overlay_29_022DEBA4.inc
@@ -104,7 +104,6 @@
 .public ov29_022EA370
 .public ov29_022EA3F8
 .public ov29_022EA418
-.public ov29_022EA428
 .public ov29_022EAD68
 .public ov29_022EAEAC
 .public ov29_022EAF34
@@ -159,7 +158,6 @@
 .public ov29_023369F8
 .public ov29_0233781C
 .public ov29_0233785C
-.public ResetVictoryCounter
 .public ov29_0233873C
 .public ov29_023389C4
 .public ov29_02338A4C
@@ -214,6 +212,7 @@
 .public ReevaluateSnatchMonster
 .public RefillTeam
 .public ResetGravity
+.public ResetVictoryCounter
 .public RunFractionalTurn
 .public SetBaseStatsMovesGroundMonster
 .public SetBothScreensWindowColorToDefault
@@ -254,6 +253,7 @@
 .public TryForcedLoss
 .public TryInflictBurnStatusWholeTeam
 .public TrySpawnDoughSeedPoke
+.public UnkMapRelatedFunc
 .public UpdateMinimap
 .public UpdateShouldBoostHiddenStairsSpawnChance
 .public UpdateShouldBoostKecleonShopSpawnChance
--- a/asm/include/overlay_29_022E1640.inc
+++ b/asm/include/overlay_29_022E1640.inc
@@ -1,10 +1,10 @@
 #pragma once
+.public DisplayTeamStatsSprite
 .public DUNGEON_PTR
 .public EntityIsValid__022E1A1C
 .public InitAnimationControlWithSet__0201C0CC
 .public ov29_022DD7D8
 .public ov29_022E3A40
-.public ov29_022E8270
 .public ov29_022ED9D0
 .public ov29_02303F18
 .public ov29_023046E8
--- a/asm/include/overlay_29_022E37DC.inc
+++ b/asm/include/overlay_29_022E37DC.inc
@@ -11,6 +11,7 @@
 .public DIRECTIONS_XY
 .public DisplayAnimatedNumbers
 .public DrawTextInWindow
+.public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PTR
 .public DungeonFloorToGroupFloor
 .public DungeonGetSpriteIndex
@@ -123,7 +124,6 @@
 .public ov29_0235352C
 .public ov29_0235354C
 .public ov29_02353558
-.public ov29_0237C850
 .public PlayEffectAnimationEntity
 .public PlaySeByIdIfNotSilence
 .public RandIntSafe
--- a/asm/include/overlay_29_022E9618.inc
+++ b/asm/include/overlay_29_022E9618.inc
@@ -9,6 +9,7 @@
 .public DISPLACEMENTS_WITHIN_3
 .public DisplayUi
 .public DUNGEON_BUTTON_INPUT
+.public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PRNG_STATE
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -46,7 +47,6 @@
 .public ov29_023517A2
 .public ov29_02353540
 .public ov29_02353560
-.public ov29_0237C850
 .public ov29_0237C888
 .public RenderWeather3D
 .public sub_0201BAC8
--- a/asm/include/overlay_29_022F05B4.inc
+++ b/asm/include/overlay_29_022F05B4.inc
@@ -66,6 +66,7 @@
 .public IsGoldenChamber
 .public IsSecretBazaarNpc
 .public IsTextLogOnTopScreen
+.public IsValidTargetEntity
 .public ItemZInit
 .public LEADER_PTR
 .public LogItemBlockedByEmbargo
@@ -87,13 +88,11 @@
 .public ov29_022E0C9C
 .public ov29_022E0DD8
 .public ov29_022E0DF0
-.public ov29_022E28D4
 .public ov29_022E2CA0
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EA370
 .public ov29_022EA3B4
-.public ov29_022EA428
 .public ov29_022EB568
 .public ov29_022EB594
 .public ov29_022EB944
@@ -198,6 +197,7 @@
 .public TryPointCameraToMonster
 .public TryTriggerMonsterHouse
 .public TryTriggerTrap
+.public UnkMapRelatedFunc
 .public UpdateAiTargetPos
 .public UpdateMinimap
 .public UpdateTrapsVisibility
--- a/asm/include/overlay_29_02302A5C.inc
+++ b/asm/include/overlay_29_02302A5C.inc
@@ -5,11 +5,13 @@
 .public DIRECTIONS_XY
 .public DisplayMessage
 .public DisplayMessage2
+.public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonRandInt
 .public EntityIsValid__02302A38
 .public EntityIsValid__023047B8
+.public FillOamAttributeInfo
 .public FormatMoveString
 .public GetEncodedHalfword
 .public GetIdleAnimationId
@@ -62,7 +64,6 @@
 .public ov29_0235280C
 .public ov29_02352810
 .public ov29_023535C8
-.public ov29_0237C850
 .public ov29_0237C888
 .public ov29_0237C9C4
 .public ov29_0237C9C5
@@ -85,7 +86,6 @@
 .public sub_0201B9F8
 .public sub_0201CF5C
 .public sub_0201D034
-.public sub_0201D110
 .public sub_0201D198
 .public sub_0201D1B0
 .public sub_0204F610
--- a/asm/include/overlay_29_02311C28.inc
+++ b/asm/include/overlay_29_02311C28.inc
@@ -12,6 +12,7 @@
 .public GetTile
 .public GetTileAtEntity
 .public GetTreatmentBetweenMonstersIgnoreStatus
+.public INGRAIN_TURN_RANGE
 .public IsProtectedFromNegativeStatus
 .public IsProtectedFromSleepClassStatus
 .public ItemIsActive__02311BF8
@@ -26,8 +27,6 @@
 .public ov10_022C4880
 .public ov10_022C4898
 .public ov10_022C48A0
-.public ov10_022C48AC
-.public ov10_022C48B8
 .public ov29_022E41F0
 .public ov29_022E4290
 .public ov29_022E4294
@@ -54,3 +53,4 @@
 .public SubstitutePlaceholderStringTags
 .public TryActivateQuickFeet
 .public UpdateStatusIconFlags
+.public WRAP_TURN_RANGE
--- a/asm/include/overlay_29_02317844.inc
+++ b/asm/include/overlay_29_02317844.inc
@@ -1,6 +1,7 @@
 #pragma once
 .public AdvanceFrame
 .public AQUA_RING_BONUS_REGEN
+.public AQUA_RING_HEALING_COUNTDOWN
 .public CalcStatusDuration
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -15,7 +16,6 @@
 .public IsProtectedFromNegativeStatus
 .public LogMessageByIdWithPopupCheckUser
 .public LogMessageByIdWithPopupCheckUserTarget
-.public ov10_022C4620
 .public ov10_022C4764
 .public ov10_022C4768
 .public ov10_022C4774
--- a/asm/include/overlay_29_0231B1B8.inc
+++ b/asm/include/overlay_29_0231B1B8.inc
@@ -4,7 +4,7 @@
 .public EntityIsValid__0231B194
 .public IsMonster__0231B318
 .public IsMonsterSleeping
+.public IsValidTargetEntity
 .public ov10_022C4530
-.public ov29_022E28D4
 .public SetPreprocessorArgsIdVal
 .public TryEndPetrifiedOrSleepStatus
--- a/asm/include/overlay_29_0231CBEC.inc
+++ b/asm/include/overlay_29_0231CBEC.inc
@@ -18,6 +18,8 @@
 .public DungeonRandInt
 .public DungeonRandOutcome__022EAB20
 .public DungeonTmLearnMove
+.public EATEN_BLAST_SEED_DAMAGE_BOSS
+.public EATEN_BLAST_SEED_DAMAGE_NORMAL
 .public EndBurnClassStatus
 .public EndFrozenClassStatus
 .public EntityIsValid__0231CBC8
@@ -50,10 +52,6 @@
 .public LowerOffensiveStat
 .public MusicTableIdxToMusicId
 .public ov10_022C44CC
-.public ov10_022C44E8
-.public ov10_022C45D4
-.public ov10_022C45D8
-.public ov10_022C45DC
 .public ov10_022C45E4
 .public ov10_022C4680
 .public ov10_022C47E0
@@ -64,7 +62,6 @@
 .public ov29_022E5AE4
 .public ov29_022E5BD8
 .public ov29_022EA370
-.public ov29_022EA428
 .public ov29_022EAF20
 .public ov29_022EAF34
 .public ov29_022EB668
@@ -103,6 +100,8 @@
 .public sub_02050FF8
 .public sub_02053D1C
 .public SubstitutePlaceholderStringTags
+.public THROWN_BLAST_SEED_DAMAGE_BOSS
+.public THROWN_BLAST_SEED_DAMAGE_NORMAL
 .public TryDecreaseBelly
 .public TryIncreaseBelly
 .public TryInflictBurnStatus
@@ -111,6 +110,7 @@
 .public TryInflictPoisonedStatus
 .public TryInflictShadowHoldStatus
 .public TryWarp
+.public UnkMapRelatedFunc
 .public UnloadFile
 .public UpdateMinimap
 .public WONDER_GUMMI_IQ_GAIN
--- a/asm/include/overlay_29_02320788.inc
+++ b/asm/include/overlay_29_02320788.inc
@@ -7,6 +7,7 @@
 .public CannotStandOnTile
 .public DetermineTileWalkableNeighbors
 .public DiscoverMinimap
+.public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PTR
 .public EntityIsValid__02320764
 .public EntityIsValid__02321438
@@ -40,7 +41,6 @@
 .public ov29_02336694
 .public ov29_023529B8
 .public ov29_02353700
-.public ov29_0237C850
 .public RemoveGroundItem
 .public ShouldDisplayEntityWrapper
 .public sub_01FFB62C
--- a/asm/include/overlay_29_0232393C.inc
+++ b/asm/include/overlay_29_0232393C.inc
@@ -22,12 +22,12 @@
 .public HasHeldItem
 .public IqSkillIsEnabled
 .public IsChargingTwoTurnMove
+.public IsValidTargetEntity
 .public MALE_ACCURACY_STAGE_MULTIPLIERS
 .public MALE_EVASION_STAGE_MULTIPLIERS
 .public MoveIsNotPhysical
 .public ov10_022BDE50
 .public ov10_022BEB2C
-.public ov29_022E28D4
 .public ov29_022E2CA0
 .public ov29_022EA370
 .public ov29_022F87C0
--- a/asm/include/overlay_29_02325644.inc
+++ b/asm/include/overlay_29_02325644.inc
@@ -71,7 +71,6 @@
 .public ov29_022E2CA0
 .public ov29_022E5474
 .public ov29_022E6D68
-.public ov29_022EA428
 .public ov29_02318BBC
 .public ov29_02318D58
 .public ov29_02332F18
@@ -124,6 +123,7 @@
 .public TryInflictWhifferStatus
 .public TryInflictYawningStatus
 .public TryResetStatChanges
+.public UnkMapRelatedFunc
 .public WATER_SPOUT_DAMAGE_MULT_TABLE
 .public WEATHER_BALL_DAMAGE_MULT_TABLE
 .public WEATHER_BALL_TYPE_TABLE
--- a/asm/include/overlay_29_023350FC.inc
+++ b/asm/include/overlay_29_023350FC.inc
@@ -8,6 +8,7 @@
 .public CeilFixedPoint
 .public Conversion2IsActive
 .public DetermineMonsterShadow
+.public DUNGEON_FRAMES_PASSED
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonGoesUp
@@ -33,7 +34,6 @@
 .public ov29_02352B4C
 .public ov29_0235371C
 .public ov29_02353720
-.public ov29_0237C850
 .public ov29_0237CA8C
 .public ov29_0237CA90
 .public ov29_0237CA96
--- a/asm/include/overlay_29_02336450.inc
+++ b/asm/include/overlay_29_02336450.inc
@@ -1,4 +1,5 @@
 #pragma once
+.public CanSeePosition
 .public Debug_Print0
 .public DEFAULT_TILE
 .public DetermineMonsterShadow
@@ -24,7 +25,6 @@
 .public ov10_022C26A0
 .public ov10_022C2720
 .public ov29_022DE0EC
-.public ov29_022E2930
 .public ov29_022E66C4
 .public ov29_022E9F80
 .public ov29_022FF958
--- a/asm/include/overlay_29_023498A0.inc
+++ b/asm/include/overlay_29_023498A0.inc
@@ -42,7 +42,6 @@
 .public MusicTableIdxToMusicId
 .public ov29_022E550C
 .public ov29_022E8244
-.public ov29_022EA428
 .public ov29_022EAC8C
 .public ov29_022EACE4
 .public ov29_022EAEFC
@@ -73,4 +72,5 @@
 .public sub_02017C10
 .public SubstitutePlaceholderStringTags
 .public TeleportFleeingOutlaw
+.public UnkMapRelatedFunc
 .public YesNoMenu
--- a/asm/include/overlay_29_0234AEE8.inc
+++ b/asm/include/overlay_29_0234AEE8.inc
@@ -24,7 +24,6 @@
 .public ov29_022E2CA0
 .public ov29_022E68F0
 .public ov29_022E9FC0
-.public ov29_022EA428
 .public ov29_022EAEFC
 .public ov29_022EAF34
 .public ov29_022F2FE4
@@ -48,3 +47,4 @@
 .public sub_02048240
 .public sub_0204833C
 .public sub_02048360
+.public UnkMapRelatedFunc
--- a/asm/include/overlay_29_0234CA84.inc
+++ b/asm/include/overlay_29_0234CA84.inc
@@ -18,7 +18,6 @@
 .public LoadOverlay
 .public LoadScriptVariableValue
 .public LogMessageByIdQuiet
-.public ov29_022EA428
 .public ov29_022EACBC
 .public ov29_0231ADA8
 .public ov29_02337EE8
@@ -65,5 +64,6 @@
 .public SetDungeonTipShown
 .public StringFromId
 .public sub_02025784
+.public UnkMapRelatedFunc
 .public UnloadOverlay
 .public WriteQuicksaveData
--- a/asm/include/overlay_29_0234D484.inc
+++ b/asm/include/overlay_29_0234D484.inc
@@ -18,7 +18,6 @@
 .public MemZero
 .public ov29_022E0B44
 .public ov29_022EA370
-.public ov29_022EA428
 .public ov29_022F2FE4
 .public ov29_02339148
 .public ov29_0234B1A4
@@ -36,4 +35,5 @@
 .public sub_0202AB94
 .public sub_0202F334
 .public sub_0202F474
+.public UnkMapRelatedFunc
 .public UnloadOverlay
--- a/asm/include/overlay_29_0234DDF4.inc
+++ b/asm/include/overlay_29_0234DDF4.inc
@@ -28,7 +28,6 @@
 .public ov29_022E0B44
 .public ov29_022E2A78
 .public ov29_022EA370
-.public ov29_022EA428
 .public ov29_022F0C1C
 .public ov29_022F0C3C
 .public ov29_022F4370
@@ -65,4 +64,5 @@
 .public sub_0202AAE8
 .public TeamMenu
 .public TryPointCameraToMonster
+.public UnkMapRelatedFunc
 .public UnloadOverlay
--- a/asm/include/overlay_29_0234EC38.inc
+++ b/asm/include/overlay_29_0234EC38.inc
@@ -43,7 +43,6 @@
 .public ov29_022E8834
 .public ov29_022E8848
 .public ov29_022EA370
-.public ov29_022EA428
 .public ov29_022F0C98
 .public ov29_022F9C34
 .public ov29_02347100
@@ -105,3 +104,4 @@
 .public sub_0205B77C
 .public sub_02061DC8
 .public sub_02061F44
+.public UnkMapRelatedFunc
--- a/asm/include/overlay_31_023838E4.inc
+++ b/asm/include/overlay_31_023838E4.inc
@@ -142,7 +142,6 @@
 .public ov29_022E1620
 .public ov29_022E2A78
 .public ov29_022EA370
-.public ov29_022EA428
 .public ov29_022EA62C
 .public ov29_022EAC78
 .public ov29_022EB2C8
@@ -286,6 +285,7 @@
 .public sub_020585B4
 .public TeamMemberHasEnabledIqSkill
 .public TryPointCameraToMonster
+.public UnkMapRelatedFunc
 .public UpdateMapSurveyorFlag
 .public UpdateWindow
 .public vsprintf
--- a/asm/main_02014D18.s
+++ b/asm/main_02014D18.s
@@ -10592,8 +10592,8 @@ sub_0201D100: ; 0x0201D100
 _0201D10C: .word sub_0201DC4C
 	arm_func_end sub_0201D100

-	arm_func_start sub_0201D110
-sub_0201D110: ; 0x0201D110
+	arm_func_start FillOamAttributeInfo
+FillOamAttributeInfo: ; 0x0201D110
 	add r3, r0, #0x10
 	mov r2, #6
 _0201D118:
@@ -10602,7 +10602,7 @@ _0201D118:
 	strh r0, [r3], #2
 	bne _0201D118
 	bx lr
-	arm_func_end sub_0201D110
+	arm_func_end FillOamAttributeInfo

 	arm_func_start sub_0201D12C
 sub_0201D12C: ; 0x0201D12C
--- a/asm/main_0202676C.s
+++ b/asm/main_0202676C.s
@@ -4933,7 +4933,7 @@ _02029C64:
 	ldrh r2, [r0, #2]
 	orr r2, r2, #0x20
 	strh r2, [r0, #2]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r1, [r4, #8]
 	ldr r0, _02029EB8 ; =CURSOR_ANIMATION_CONTROL
 	sub r1, r1, #4
@@ -4952,7 +4952,7 @@ _02029CF0:
 	ldrh r2, [r0, #2]
 	orr r2, r2, #0x20
 	strh r2, [r0, #2]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r1, [r4, #8]
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
 	sub r1, r1, #4
@@ -5034,7 +5034,7 @@ _02029DEC:
 	ldrh r2, [r0, #2]
 	orr r2, r2, #0x20
 	strh r2, [r0, #2]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r1, [r4, #8]
 	ldr r0, _02029EB8 ; =CURSOR_ANIMATION_CONTROL
 	sub r1, r1, #4
@@ -5053,7 +5053,7 @@ _02029E6C:
 	ldrh r2, [r0, #2]
 	orr r2, r2, #0x20
 	strh r2, [r0, #2]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r1, [r4, #8]
 	ldr r0, _02029EBC ; =CURSOR_16_ANIMATION_CONTROL
 	sub r1, r1, #4
--- a/asm/overlay_01.s
+++ b/asm/overlay_01.s
@@ -8656,7 +8656,7 @@ ov01_02330224: ; 0x02330224
 	ldr r1, [r0]
 	add r0, r1, #0x94
 	add r1, r1, #0x84
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r0, _02330584 ; =ov01_0233C164
 	ldr r1, [r0]
 	add r0, r1, #0x94
@@ -8696,7 +8696,7 @@ ov01_02330224: ; 0x02330224
 	ldr r1, [r1]
 	add r0, r1, #0x110
 	add r1, r1, #0x84
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r0, _02330584 ; =ov01_0233C164
 	ldr r0, [r0]
 	ldrsh r1, [r0, #0x90]
@@ -8740,7 +8740,7 @@ ov01_02330224: ; 0x02330224
 	ldr r1, [r1]
 	add r0, r1, #0x18c
 	add r1, r1, #0x84
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldr r0, _02330584 ; =ov01_0233C164
 	ldr r1, [r0]
 	add r0, r1, #0x18c
--- a/asm/overlay_10_022BCC7C.s
+++ b/asm/overlay_10_022BCC7C.s
@@ -1304,7 +1304,7 @@ ov10_022BDCBC: ; 0x022BDCBC
 	cmp r1, #0
 	bne _022BDD30
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _022BDD30:
 	add r0, r4, #0xe8
 	bl sub_0206423C
@@ -1486,7 +1486,7 @@ ov10_022BDF34: ; 0x022BDF34
 	cmp r0, #0
 	bne _022BDF90
 	mov r0, #0xd
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _022BDF90:
 	ldr r1, [r4]
 	mov r0, #2
@@ -3186,7 +3186,7 @@ _022BF648:
 	bge _022BF6D4
 	add r0, r6, #0x68
 	add r1, r6, #0x30
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	strh r4, [r6, #0x84]
 	strh r7, [r6, #0x86]
 	add r0, r6, #0x68
@@ -4229,7 +4229,7 @@ _022C034C:
 	bne _022C0364
 	mov r0, #5
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _022C0364:
 	ldr r0, [r4]
 	cmp r0, #0
--- a/asm/overlay_10_022C4394.s
+++ b/asm/overlay_10_022C4394.s
@@ -203,8 +203,8 @@ MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE:
 	.global PITFALL_TRAP_DAMAGE
 PITFALL_TRAP_DAMAGE:
 	.byte 0x05, 0x00, 0x00, 0x00
-	.global ov10_022C44E8
-ov10_022C44E8:
+	.global EATEN_BLAST_SEED_DAMAGE_NORMAL
+EATEN_BLAST_SEED_DAMAGE_NORMAL:
 	.byte 0x23, 0x00, 0x00, 0x00
 	.global ov10_022C44EC
 ov10_022C44EC:
--- a/asm/overlay_10_rodata_022C4584.s
+++ b/asm/overlay_10_rodata_022C4584.s
@@ -62,14 +62,14 @@ ov10_022C45CC:
 	.global WRAP_DAMAGE
 WRAP_DAMAGE:
 	.byte 0x06, 0x00, 0x00, 0x00
-	.global ov10_022C45D4
-ov10_022C45D4:
+	.global THROWN_BLAST_SEED_DAMAGE_NORMAL
+THROWN_BLAST_SEED_DAMAGE_NORMAL:
 	.byte 0x19, 0x00, 0x00, 0x00
-	.global ov10_022C45D8
-ov10_022C45D8:
+	.global THROWN_BLAST_SEED_DAMAGE_BOSS
+THROWN_BLAST_SEED_DAMAGE_BOSS:
 	.byte 0x19, 0x00, 0x00, 0x00
-	.global ov10_022C45DC
-ov10_022C45DC:
+	.global EATEN_BLAST_SEED_DAMAGE_BOSS
+EATEN_BLAST_SEED_DAMAGE_BOSS:
 	.byte 0x23, 0x00, 0x00, 0x00
 	.global TYPE_ADVANTAGE_MASTER_CRIT_RATE
 TYPE_ADVANTAGE_MASTER_CRIT_RATE:
@@ -119,8 +119,8 @@ ov10_022C4618:
 	.global SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE
 SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE:
 	.byte 0x14, 0x00, 0x00, 0x00
-	.global ov10_022C4620
-ov10_022C4620:
+	.global AQUA_RING_HEALING_COUNTDOWN
+AQUA_RING_HEALING_COUNTDOWN:
 	.byte 0x04, 0x00, 0x00, 0x00
 	.global STICK_POWER
 STICK_POWER:
--- a/asm/overlay_10_rodata_022C464C.s
+++ b/asm/overlay_10_rodata_022C464C.s
@@ -458,8 +458,8 @@ SOLARBEAM_DAMAGE_MULTIPLIER:
 	.global SKY_ATTACK_DAMAGE_MULTIPLIER
 SKY_ATTACK_DAMAGE_MULTIPLIER:
 	.byte 0x00, 0x02, 0x00, 0x00
-	.global ov10_022C48AC
-ov10_022C48AC:
+	.global WRAP_TURN_RANGE
+WRAP_TURN_RANGE:
 	.byte 0x02, 0x00, 0x05, 0x00
 	.global RAZOR_WIND_DAMAGE_MULTIPLIER
 RAZOR_WIND_DAMAGE_MULTIPLIER:
@@ -467,8 +467,8 @@ RAZOR_WIND_DAMAGE_MULTIPLIER:
 	.global FOCUS_PUNCH_DAMAGE_MULTIPLIER
 FOCUS_PUNCH_DAMAGE_MULTIPLIER:
 	.byte 0x00, 0x02, 0x00, 0x00
-	.global ov10_022C48B8
-ov10_022C48B8:
+	.global INGRAIN_TURN_RANGE
+INGRAIN_TURN_RANGE:
 	.byte 0x0F, 0x00, 0x1E, 0x00
 	.global SKULL_BASH_DAMAGE_MULTIPLIER
 SKULL_BASH_DAMAGE_MULTIPLIER:
--- a/asm/overlay_11_022EE5E4.s
+++ b/asm/overlay_11_022EE5E4.s
@@ -9011,7 +9011,7 @@ _022F5768:
 	add r0, r5, #0xc
 	orr r2, r2, #0x20
 	strh r2, [r5, #0xe]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	add r0, r5, #0xc
 	bl sub_0201CF5C
 	mov r0, #0
@@ -9047,7 +9047,7 @@ _022F5808:
 	add r0, r5, #0xc
 	orr r2, r2, #0x20
 	strh r2, [r5, #0xe]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	add r0, r5, #0xc
 	bl sub_0201CF5C
 	mov r0, #0
@@ -9083,7 +9083,7 @@ _022F5870:
 	add r0, r5, #0xc
 	orr r2, r2, #0x20
 	strh r2, [r5, #0xe]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	add r0, r5, #0xc
 	bl sub_0201CF5C
 	mov r0, #0
--- a/asm/overlay_29_022DEBA4.s
+++ b/asm/overlay_29_022DEBA4.s
@@ -734,7 +734,7 @@ _022DF5E4:
 	bl ov29_02338F38
 	mov r0, #4
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #0
 	bl ov29_0234B1A4
 	mov r0, r5
@@ -860,7 +860,7 @@ _022DF7B4:
 	bl ov29_0233904C
 	mov r0, #1
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ov29_0233A15C
 	bl GetTopScreenOption
@@ -908,7 +908,7 @@ _022DF82C:
 	bl ov29_02338F48
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldr r0, [sp]
 	mov r1, #0
 	str r1, [sb, #0xc4]
@@ -1149,7 +1149,7 @@ _022DFBE4:
 	bl ov29_02338F38
 	mov r0, #1
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #0
 	bl SetMinimapDataE447
 	ldr r0, _022DFF40 ; =DUNGEON_PTR
--- a/asm/overlay_29_022E1640.s
+++ b/asm/overlay_29_022E1640.s
@@ -245,7 +245,7 @@ _022E1908:
 	mov r0, r7
 	mov r1, r5
 	mov r2, r2, asr #0x10
-	bl ov29_022E8270
+	bl DisplayTeamStatsSprite
 	add r0, r5, #1
 	mov r0, r0, lsl #0x10
 	mov r5, r0, asr #0x10
--- a/asm/overlay_29_022E28D4.s
+++ b/asm/overlay_29_022E28D4.s
@@ -3,8 +3,8 @@

 	.text

-	arm_func_start ov29_022E28D4
-ov29_022E28D4: ; 0x022E28D4
+	arm_func_start IsValidTargetEntity
+IsValidTargetEntity: ; 0x022E28D4
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	mov r4, r1
@@ -28,10 +28,10 @@ ov29_022E28D4: ; 0x022E28D4
 	add r1, r4, #4
 	bl IsPositionActuallyInSight
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov29_022E28D4
+	arm_func_end IsValidTargetEntity

-	arm_func_start ov29_022E2930
-ov29_022E2930: ; 0x022E2930
+	arm_func_start CanSeePosition
+CanSeePosition: ; 0x022E2930
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	mov r4, r1
@@ -41,4 +41,4 @@ ov29_022E2930: ; 0x022E2930
 	add r0, r5, #4
 	bl IsPositionActuallyInSight
 	ldmia sp!, {r3, r4, r5, pc}
-	arm_func_end ov29_022E2930
+	arm_func_end CanSeePosition
--- a/asm/overlay_29_022E37DC.s
+++ b/asm/overlay_29_022E37DC.s
@@ -6107,8 +6107,8 @@ ov29_022E8244: ; 0x022E8244
 _022E826C: .word TOP_SCREEN_STATUS_PTR
 	arm_func_end ov29_022E8244

-	arm_func_start ov29_022E8270
-ov29_022E8270: ; 0x022E8270
+	arm_func_start DisplayTeamStatsSprite
+DisplayTeamStatsSprite: ; 0x022E8270
 #ifdef JAPAN
 #define OV29_022E8270_OFFSET -0xA4
 #else
@@ -6199,7 +6199,7 @@ _022E8368:
 	cmpne r0, #4
 	cmpne r1, #2
 	bne _022E83A4
-	ldr r0, _022E8408 ; =ov29_0237C850
+	ldr r0, _022E8408 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	and r0, r0, #2
 	add r0, r6, r0
@@ -6233,8 +6233,8 @@ _022E83F4:
 _022E83FC: .word TOP_SCREEN_STATUS_PTR
 _022E8400: .word DUNGEON_PTR
 _022E8404: .word 0x00000229
-_022E8408: .word ov29_0237C850
-	arm_func_end ov29_022E8270
+_022E8408: .word DUNGEON_FRAMES_PASSED
+	arm_func_end DisplayTeamStatsSprite

 	arm_func_start ov29_022E840C
 ov29_022E840C: ; 0x022E840C
--- a/asm/overlay_29_022E9618.s
+++ b/asm/overlay_29_022E9618.s
@@ -522,7 +522,7 @@ _022E9CB4: .word ov29_023517A2
 	arm_func_start ov29_022E9CB8
 ov29_022E9CB8: ; 0x022E9CB8
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
-	ldr r1, _022E9F04 ; =ov29_0237C850
+	ldr r1, _022E9F04 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, _022E9F08 ; =0xFFFF000F
 	ldrh r2, [r1, #0x1a]
 	mov lr, #0
@@ -671,7 +671,7 @@ _022E9DD4:
 	blt _022E9DA0
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
 	.align 2, 0
-_022E9F04: .word ov29_0237C850
+_022E9F04: .word DUNGEON_FRAMES_PASSED
 _022E9F08: .word 0xFFFF000F
 _022E9F0C: .word ov29_0237C888
 _022E9F10: .word ov29_02351628
@@ -682,7 +682,7 @@ _022E9F14: .word ov29_02351658
 ov29_022E9F18: ; 0x022E9F18
 	stmdb sp!, {r3, lr}
 	ldr r0, _022E9F70 ; =0x000003E7
-	ldr r1, _022E9F74 ; =ov29_0237C850
+	ldr r1, _022E9F74 ; =DUNGEON_FRAMES_PASSED
 	mov r2, #0
 	str r0, [r1, #4]
 	ldr r0, _022E9F78 ; =ov29_02353560
@@ -693,7 +693,7 @@ ov29_022E9F18: ; 0x022E9F18
 	ldr r2, _022E9F7C ; =DUNGEON_PTR
 	mov r3, #1
 	ldr r0, [r2]
-	ldr r1, _022E9F74 ; =ov29_0237C850
+	ldr r1, _022E9F74 ; =DUNGEON_FRAMES_PASSED
 	add r0, r0, #0x1a000
 #ifdef JAPAN
 	strb r3, [r0, #0x1a8]
@@ -712,7 +712,7 @@ ov29_022E9F18: ; 0x022E9F18
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _022E9F70: .word 0x000003E7
-_022E9F74: .word ov29_0237C850
+_022E9F74: .word DUNGEON_FRAMES_PASSED
 _022E9F78: .word ov29_02353560
 _022E9F7C: .word DUNGEON_PTR
 	arm_func_end ov29_022E9F18
@@ -855,7 +855,7 @@ _022EA0F8:
 	cmp r0, #0x64
 	addlt r0, r0, #1
 	strlth r0, [r1, #0x1c]
-	ldr r0, _022EA29C ; =ov29_0237C850
+	ldr r0, _022EA29C ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0, #4]
 	cmp r0, #0
 	cmpne r0, #3
@@ -955,7 +955,7 @@ _022EA260:
 #endif
 	bl ov29_022DD8B4
 _022EA27C:
-	ldr r0, _022EA29C ; =ov29_0237C850
+	ldr r0, _022EA29C ; =DUNGEON_FRAMES_PASSED
 	ldr r1, [r0]
 	add r1, r1, #1
 	str r1, [r0]
@@ -964,7 +964,7 @@ _022EA27C:
 _022EA290: .word DUNGEON_PTR
 _022EA294: .word ov29_02353560
 _022EA298: .word 0x0001A224 + OV29_022EA008_OFFSET
-_022EA29C: .word ov29_0237C850
+_022EA29C: .word DUNGEON_FRAMES_PASSED
 _022EA2A0: .word 0x0001A21C + OV29_022EA008_OFFSET
 	arm_func_end ov29_022EA008

@@ -981,7 +981,7 @@ _022EA2C0:
 	ldr r0, _022EA31C ; =ov29_02353560
 	ldrb r0, [r0, #6]
 	cmp r0, #0
-	ldrne r0, _022EA320 ; =ov29_0237C850
+	ldrne r0, _022EA320 ; =DUNGEON_FRAMES_PASSED
 	ldrne r1, [r0, #0x10]
 	addne r1, r1, #1
 	strne r1, [r0, #0x10]
@@ -999,7 +999,7 @@ _022EA2C0:
 	ldr r0, _022EA31C ; =ov29_02353560
 	ldrb r0, [r0, #6]
 	cmp r0, #0
-	ldrne r0, _022EA320 ; =ov29_0237C850
+	ldrne r0, _022EA320 ; =DUNGEON_FRAMES_PASSED
 	ldrne r1, [r0, #0x10]
 	subne r1, r1, #1
 	strne r1, [r0, #0x10]
@@ -1007,7 +1007,7 @@ _022EA2C0:
 	.align 2, 0
 _022EA318: .word DUNGEON_PTR
 _022EA31C: .word ov29_02353560
-_022EA320: .word ov29_0237C850
+_022EA320: .word DUNGEON_FRAMES_PASSED
 	arm_func_end ov29_022EA2A4

 	arm_func_start ov29_022EA324
@@ -1016,7 +1016,7 @@ ov29_022EA324: ; 0x022EA324
 	ldr r0, _022EA368 ; =ov29_02353560
 	ldrb r0, [r0, #6]
 	cmp r0, #0
-	ldrne r0, _022EA36C ; =ov29_0237C850
+	ldrne r0, _022EA36C ; =DUNGEON_FRAMES_PASSED
 	ldrne r1, [r0, #0x10]
 	addne r1, r1, #1
 	strne r1, [r0, #0x10]
@@ -1024,14 +1024,14 @@ ov29_022EA324: ; 0x022EA324
 	ldr r0, _022EA368 ; =ov29_02353560
 	ldrb r0, [r0, #6]
 	cmp r0, #0
-	ldrne r0, _022EA36C ; =ov29_0237C850
+	ldrne r0, _022EA36C ; =DUNGEON_FRAMES_PASSED
 	ldrne r1, [r0, #0x10]
 	subne r1, r1, #1
 	strne r1, [r0, #0x10]
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _022EA368: .word ov29_02353560
-_022EA36C: .word ov29_0237C850
+_022EA36C: .word DUNGEON_FRAMES_PASSED
 	arm_func_end ov29_022EA324

 	arm_func_start ov29_022EA370
@@ -1096,11 +1096,11 @@ _022EA404: .word ov29_022DE638

 	arm_func_start ov29_022EA408
 ov29_022EA408: ; 0x022EA408
-	ldr r0, _022EA414 ; =ov29_0237C850
+	ldr r0, _022EA414 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0, #4]
 	bx lr
 	.align 2, 0
-_022EA414: .word ov29_0237C850
+_022EA414: .word DUNGEON_FRAMES_PASSED
 	arm_func_end ov29_022EA408

 	arm_func_start ov29_022EA418
@@ -1112,10 +1112,10 @@ ov29_022EA418: ; 0x022EA418
 _022EA424: .word ov29_02353560
 	arm_func_end ov29_022EA418

-	arm_func_start ov29_022EA428
-ov29_022EA428: ; 0x022EA428
+	arm_func_start UnkMapRelatedFunc
+UnkMapRelatedFunc: ; 0x022EA428
 	stmdb sp!, {r4, lr}
-	ldr r1, _022EA620 ; =ov29_0237C850
+	ldr r1, _022EA620 ; =DUNGEON_FRAMES_PASSED
 	mov r4, r0
 	ldr r0, [r1, #4]
 	cmp r4, r0
@@ -1252,25 +1252,25 @@ _022EA5FC:
 	mov r0, #0
 	bl ov29_0234B1A4
 _022EA614:
-	ldr r0, _022EA620 ; =ov29_0237C850
+	ldr r0, _022EA620 ; =DUNGEON_FRAMES_PASSED
 	str r4, [r0, #4]
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_022EA620: .word ov29_0237C850
+_022EA620: .word DUNGEON_FRAMES_PASSED
 _022EA624: .word 0x000003E7
 _022EA628: .word ov29_02353560
-	arm_func_end ov29_022EA428
+	arm_func_end UnkMapRelatedFunc

 	arm_func_start ov29_022EA62C
 ov29_022EA62C: ; 0x022EA62C
-	ldr r1, _022EA644 ; =ov29_0237C850
+	ldr r1, _022EA644 ; =DUNGEON_FRAMES_PASSED
 	mov r2, #0xa
 	ldr ip, _022EA648 ; =ov29_0234B1A4
 	mov r0, #0
 	str r2, [r1, #4]
 	bx ip
 	.align 2, 0
-_022EA644: .word ov29_0237C850
+_022EA644: .word DUNGEON_FRAMES_PASSED
 _022EA648: .word ov29_0234B1A4
 	arm_func_end ov29_022EA62C

@@ -1278,19 +1278,19 @@ _022EA648: .word ov29_0234B1A4
 ov29_022EA64C: ; 0x022EA64C
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #8
-	ldr r0, _022EA708 ; =ov29_0237C850
+	ldr r0, _022EA708 ; =DUNGEON_FRAMES_PASSED
 	mov r2, #0
 	ldr r1, [r0, #8]
 	adds r1, r1, #1
 	str r1, [r0, #8]
 	movmi r1, #0
 	strmi r1, [r0, #8]
-	ldr r0, _022EA708 ; =ov29_0237C850
+	ldr r0, _022EA708 ; =DUNGEON_FRAMES_PASSED
 	ldr r1, [r0, #8]
 	cmp r1, #0xc
 	movge r1, #0
 	strge r1, [r0, #8]
-	ldr r0, _022EA708 ; =ov29_0237C850
+	ldr r0, _022EA708 ; =DUNGEON_FRAMES_PASSED
 	mov r1, #0xb
 	ldr r3, [r0, #8]
 	mov r0, r3, asr #1
@@ -1324,7 +1324,7 @@ ov29_022EA64C: ; 0x022EA64C
 	add sp, sp, #8
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_022EA708: .word ov29_0237C850
+_022EA708: .word DUNGEON_FRAMES_PASSED
 _022EA70C: .word ov29_02353540
 _022EA710: .word _020AFC4C
 _022EA714: .word 0x000001EA
@@ -1350,7 +1350,7 @@ DisplayAnimatedNumbers: ; 0x022EA718
 	ldmneia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	mov r6, #0
 	mov fp, #0x29
-	ldr r5, _022EA800 ; =ov29_0237C850
+	ldr r5, _022EA800 ; =DUNGEON_FRAMES_PASSED
 	ldr r4, _022EA804 ; =ov29_02353560
 	b _022EA78C
 _022EA75C:
@@ -1372,7 +1372,7 @@ _022EA78C:
 	cmp r6, #0x14
 	blt _022EA75C
 _022EA794:
-	ldr r1, _022EA800 ; =ov29_0237C850
+	ldr r1, _022EA800 ; =DUNGEON_FRAMES_PASSED
 	mov r0, #0x3c
 	str sl, [r1, #0x20]
 	strb r8, [r1, #0x24]
@@ -1401,7 +1401,7 @@ _022EA7F4:
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
 _022EA7FC: .word DUNGEON_PTR
-_022EA800: .word ov29_0237C850
+_022EA800: .word DUNGEON_FRAMES_PASSED
 _022EA804: .word ov29_02353560
 _022EA808: .word 0xFFFFFC19
 	arm_func_end DisplayAnimatedNumbers
@@ -1410,7 +1410,7 @@ _022EA808: .word 0xFFFFFC19
 ov29_022EA80C: ; 0x022EA80C
 	stmdb sp!, {r4, r5, lr}
 	sub sp, sp, #0xc
-	ldr r0, _022EA95C ; =ov29_0237C850
+	ldr r0, _022EA95C ; =DUNGEON_FRAMES_PASSED
 	ldrsh r1, [r0, #0x1c]
 	cmp r1, #0
 	beq _022EA954
@@ -1425,11 +1425,11 @@ ov29_022EA80C: ; 0x022EA80C
 	and r0, r0, #0xff
 _022EA848:
 	cmp r0, #0
-	ldreq r0, _022EA95C ; =ov29_0237C850
+	ldreq r0, _022EA95C ; =DUNGEON_FRAMES_PASSED
 	moveq r1, #0
 	streqh r1, [r0, #0x1c]
 	beq _022EA954
-	ldr r3, _022EA95C ; =ov29_0237C850
+	ldr r3, _022EA95C ; =DUNGEON_FRAMES_PASSED
 	ldr r5, [r3, #0x28]
 	ldr r1, [r3, #0x2c]
 	ldrh r0, [r5, #0x26]
@@ -1480,7 +1480,7 @@ _022EA848:
 	mov r1, #0x1f
 	bl _s32_div_f
 _022EA910:
-	ldr ip, _022EA95C ; =ov29_0237C850
+	ldr ip, _022EA95C ; =DUNGEON_FRAMES_PASSED
 	mov r1, r4, lsl #0x10
 	ldrh r4, [ip, #0x1e]
 	mov r2, r5, lsl #0x10
@@ -1501,7 +1501,7 @@ _022EA954:
 	add sp, sp, #0xc
 	ldmia sp!, {r4, r5, pc}
 	.align 2, 0
-_022EA95C: .word ov29_0237C850
+_022EA95C: .word DUNGEON_FRAMES_PASSED
 _022EA960: .word DUNGEON_PTR
 #ifdef JAPAN
 _022EA964: .word 0x0001A180
--- a/asm/overlay_29_022F05B4.s
+++ b/asm/overlay_29_022F05B4.s
@@ -227,12 +227,12 @@ _022F0844: .word DUNGEON_PTR

 	arm_func_start ov29_022F0848
 ov29_022F0848: ; 0x022F0848
-	ldr ip, _022F0858 ; =ov29_022EA428
+	ldr ip, _022F0858 ; =UnkMapRelatedFunc
 	mov r0, #0
 	mov r1, r0
 	bx ip
 	.align 2, 0
-_022F0858: .word ov29_022EA428
+_022F0858: .word UnkMapRelatedFunc
 	arm_func_end ov29_022F0848

 	arm_func_start ov29_022F085C
@@ -622,7 +622,7 @@ _022F0D24:
 	beq _022F0D44
 	mov r0, #0xc
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _022F0D44:
 	bl ov29_023391C0
 	mov sb, r0
@@ -704,7 +704,7 @@ _022F0E44:
 	beq _022F0E64
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _022F0E64:
 	mov r0, sb
 	mov r1, #0
@@ -2642,7 +2642,7 @@ _022F2A00:
 	bl ov29_0233A248
 	mov r0, #1
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldrb r0, [sp, #0xb9]
 	cmp r0, #0
 	beq _022F2A70
@@ -3869,7 +3869,7 @@ ov29_022F3AFC: ; 0x022F3AFC
 	ldmeqia sp!, {r4, r5, r6, pc}
 	mov r0, r6
 	mov r1, r4
-	bl ov29_022E28D4
+	bl IsValidTargetEntity
 	cmp r0, #0
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, pc}
--- a/asm/overlay_29_02302A5C.s
+++ b/asm/overlay_29_02302A5C.s
@@ -1821,7 +1821,7 @@ _0230422C:
 	bl ov29_022ECB38
 	cmp r0, #0
 	beq _023042B0
-	ldr r0, _023046D8 ; =ov29_0237C850
+	ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #1
 	mvnne r0, #1
@@ -1842,7 +1842,7 @@ _023042D8:
 	ldrb r0, [r5, #0x173 + OV29_02303F18_OFFSET]
 	cmp r0, #0
 	beq _023042FC
-	ldr r0, _023046D8 ; =ov29_0237C850
+	ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #4
 	movne r0, #1
@@ -1950,7 +1950,7 @@ _02304458:
 	bl ov29_02338988
 	cmp r0, #0
 	beq _02304498
-	ldr r0, _023046D8 ; =ov29_0237C850
+	ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #1
 	beq _023044B8
@@ -1970,7 +1970,7 @@ _023044B8:
 	add r0, r7, #0x2c
 	orr r2, r2, #0x20
 	strh r2, [r7, #0x2e]
-	bl sub_0201D110
+	bl FillOamAttributeInfo
 	ldrb r0, [r5, #6]
 	cmp r0, #0
 	ldrneb r0, [r5, #0xd8]
@@ -2005,7 +2005,7 @@ _02304510:
 	cmpne r0, #4
 	cmpne r1, #2
 	bne _02304558
-	ldr r0, _023046D8 ; =ov29_0237C850
+	ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	and r0, r0, #2
 	add r0, r8, r0
@@ -2021,7 +2021,7 @@ _02304558:
 _02304570:
 	cmp r0, #1
 	bne _02304590
-	ldr r0, _023046D8 ; =ov29_0237C850
+	ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #1
 	beq _02304590
@@ -2058,7 +2058,7 @@ _02304590:
 	bl ov29_022ECB38
 	cmp r0, #0
 	beq _02304628
-	ldr r0, _023046D8 ; =ov29_0237C850
+	ldr r0, _023046D8 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #1
 	mvnne r0, #1
@@ -2116,7 +2116,7 @@ _023046C8: .word DUNGEON_PTR
 _023046CC: .word ov29_02352810
 _023046D0: .word 0x00000229
 _023046D4: .word 0x0001A224 + OV29_02303F18_OFFSET_2
-_023046D8: .word ov29_0237C850
+_023046D8: .word DUNGEON_FRAMES_PASSED
 _023046DC: .word ov29_0235280C
 _023046E0: .word 0x0000F3FF
 _023046E4: .word 0xFFFFFE5D
--- a/asm/overlay_29_02311C28.s
+++ b/asm/overlay_29_02311C28.s
@@ -1632,7 +1632,7 @@ _0231316C:
 	ldrb r0, [r4, #0xc4]
 	cmp r0, #5
 	beq _023131CC
-	ldr r1, _023131E8 ; =ov10_022C48B8
+	ldr r1, _023131E8 ; =INGRAIN_TURN_RANGE
 	mov r3, #5
 	mov r0, r5
 	mov r2, #0
@@ -1659,7 +1659,7 @@ _023131DC:
 	bl UpdateStatusIconFlags
 	ldmia sp!, {r4, r5, r6, pc}
 	.align 2, 0
-_023131E8: .word ov10_022C48B8
+_023131E8: .word INGRAIN_TURN_RANGE
 #ifdef JAPAN
 _023131EC: .word 0x00000A69
 _023131F0: .word 0x00000A6A
@@ -1709,7 +1709,7 @@ TryInflictWrappedStatus: ; 0x023131F4
 	mov r0, #0x7f
 	strb r0, [r4, #0xcc]
 	mov r2, #0
-	ldr r1, _023133DC ; =ov10_022C48AC
+	ldr r1, _023133DC ; =WRAP_TURN_RANGE
 	mov r0, r6
 	strb r2, [r4, #0xcd]
 	mov r3, #4
@@ -1809,7 +1809,7 @@ _023133D0:
 #else
 #define TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET 0
 #endif
-_023133DC: .word ov10_022C48AC
+_023133DC: .word WRAP_TURN_RANGE
 _023133E0: .word DUNGEON_PTR
 _023133E4: .word 0x00000D2B + TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET
 _023133E8: .word 0x00000D2C + TRY_INFLICT_WRAPPED_STATUS_DATA_OFFSET
--- a/asm/overlay_29_02317844.s
+++ b/asm/overlay_29_02317844.s
@@ -934,13 +934,13 @@ SetAquaRingHealingCountdownTo4: ; 0x023183C0
 	mov r4, r0
 	bl EntityIsValid__02315118
 	cmp r0, #0
-	ldrne r0, _023183E4 ; =ov10_022C4620
+	ldrne r0, _023183E4 ; =AQUA_RING_HEALING_COUNTDOWN
 	ldrne r1, [r4, #0xb4]
 	ldrnesh r0, [r0]
 	strneb r0, [r1, #0xd7]
 	ldmia sp!, {r4, pc}
 	.align 2, 0
-_023183E4: .word ov10_022C4620
+_023183E4: .word AQUA_RING_HEALING_COUNTDOWN
 	arm_func_end SetAquaRingHealingCountdownTo4

 	arm_func_start ApplyAquaRingHealing
--- a/asm/overlay_29_0231B1B8.s
+++ b/asm/overlay_29_0231B1B8.s
@@ -72,7 +72,7 @@ _0231B27C:
 	beq _0231B2F0
 	mov r0, sl
 	mov r1, sb
-	bl ov29_022E28D4
+	bl IsValidTargetEntity
 	cmp r0, #0
 	cmpne sl, sb
 	beq _0231B2F0
--- a/asm/overlay_29_0231CBEC.s
+++ b/asm/overlay_29_0231CBEC.s
@@ -339,8 +339,8 @@ ApplyBlastSeedEffect: ; 0x0231CF84
 	ldr r7, [r5, #0xb4]
 	bl IsCurrentFixedRoomBossFight
 	cmp r0, #0
-	ldrne r0, _0231D0A8 ; =ov10_022C45D8
-	ldreq r0, _0231D0AC ; =ov10_022C45D4
+	ldrne r0, _0231D0A8 ; =THROWN_BLAST_SEED_DAMAGE_BOSS
+	ldreq r0, _0231D0AC ; =THROWN_BLAST_SEED_DAMAGE_NORMAL
 	ldrsh r4, [r0]
 	ldrb r0, [r7, #0xc4]
 	cmp r0, #1
@@ -380,8 +380,8 @@ _0231D034:
 	ldr r7, [r4, #0xb4]
 	bl IsCurrentFixedRoomBossFight
 	cmp r0, #0
-	ldrne r0, _0231D0B8 ; =ov10_022C45DC
-	ldreq r0, _0231D0BC ; =ov10_022C44E8
+	ldrne r0, _0231D0B8 ; =EATEN_BLAST_SEED_DAMAGE_BOSS
+	ldreq r0, _0231D0BC ; =EATEN_BLAST_SEED_DAMAGE_NORMAL
 	ldrsh r5, [r0]
 	ldrb r0, [r7, #0xc4]
 	cmp r0, #1
@@ -409,16 +409,16 @@ _0231D0A0:
 	add sp, sp, #0x1c
 	ldmia sp!, {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0231D0A8: .word ov10_022C45D8
-_0231D0AC: .word ov10_022C45D4
+_0231D0A8: .word THROWN_BLAST_SEED_DAMAGE_BOSS
+_0231D0AC: .word THROWN_BLAST_SEED_DAMAGE_NORMAL
 _0231D0B0: .word 0x00000255
 #ifdef JAPAN
 _0231D0B4: .word 0x00000931
 #else
 _0231D0B4: .word 0x00000BF2
 #endif
-_0231D0B8: .word ov10_022C45DC
-_0231D0BC: .word ov10_022C44E8
+_0231D0B8: .word EATEN_BLAST_SEED_DAMAGE_BOSS
+_0231D0BC: .word EATEN_BLAST_SEED_DAMAGE_NORMAL
 	arm_func_end ApplyBlastSeedEffect

 	arm_func_start ApplyGummiBoostsDungeonMode
@@ -1539,7 +1539,7 @@ _0231DEB0:
 	bne _0231DF1C
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	b _0231DFF4
 _0231DF00:
 	mov r0, #0
@@ -1561,7 +1561,7 @@ _0231DF34:
 	bne _0231DF60
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add r0, r4, #0x4a
 	bl ov31_02386204
 	mov r0, #1
@@ -1573,7 +1573,7 @@ _0231DF60:
 	bne _0231DF8C
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add r0, r4, #0x4a
 	mov r1, #0
 	bl ov31_02386308
@@ -1585,7 +1585,7 @@ _0231DF8C:
 	bne _0231DFB0
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add r0, r4, #0x4a
 	mov r1, #0
 	bl ov31_023860A4
@@ -1595,7 +1595,7 @@ _0231DFB0:
 	bne _0231DFD4
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add r0, r4, #0x4a
 	mov r1, #0
 	bl ov31_023860A4
@@ -1605,7 +1605,7 @@ _0231DFD4:
 	bne _0231DE6C
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add r0, r4, #0x4a
 	bl ov31_0238619C
 	b _0231DE6C
--- a/asm/overlay_29_02320788.s
+++ b/asm/overlay_29_02320788.s
@@ -522,7 +522,7 @@ _02320E20:
 	cmp r0, #0
 	beq _02320EA4
 	ldrb sl, [r5, #0x4c]
-	ldr fp, _023210FC ; =ov29_0237C850
+	ldr fp, _023210FC ; =DUNGEON_FRAMES_PASSED
 _02320E60:
 	ldr r0, [r8, #0x1c]
 	add r0, r0, #0x800
@@ -669,7 +669,7 @@ _02321008:
 	beq _023210A0
 	ldrb sl, [r5, #0x4c]
 	mov r0, #0xa000
-	ldr r6, _023210FC ; =ov29_0237C850
+	ldr r6, _023210FC ; =DUNGEON_FRAMES_PASSED
 	str r0, [r8, #0x1c]
 	mov fp, #0x22
 _0232105C:
@@ -723,7 +723,7 @@ _023210EC: .word DUNGEON_PTR
 _023210F0: .word 0x00000E72 + TRY_WARP_DATA_OFFSET
 _023210F4: .word 0x00000E73 + TRY_WARP_DATA_OFFSET
 _023210F8: .word 0x00000E71 + TRY_WARP_DATA_OFFSET
-_023210FC: .word ov29_0237C850
+_023210FC: .word DUNGEON_FRAMES_PASSED
 _02321100: .word 0x00000E75 + TRY_WARP_DATA_OFFSET
 	arm_func_end TryWarp

--- a/asm/overlay_29_0232393C.s
+++ b/asm/overlay_29_0232393C.s
@@ -628,7 +628,7 @@ _023241B8:
 	beq _02324238
 	mov r0, sb
 	mov r1, r7
-	bl ov29_022E28D4
+	bl IsValidTargetEntity
 	cmp r0, #0
 	beq _02324238
 	cmp r7, sb
--- a/asm/overlay_29_02325644.s
+++ b/asm/overlay_29_02325644.s
@@ -549,7 +549,7 @@ ov29_02325D7C: ; 0x02325D7C
 	ldmeqia sp!, {r4, pc}
 	mov r0, #5
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #0x5c
 	bl AdvanceFrame
 	ldmia sp!, {r4, pc}
--- a/asm/overlay_29_023350FC.s
+++ b/asm/overlay_29_023350FC.s
@@ -836,7 +836,7 @@ _02336498:
 	moveq sb, #1
 	cmp r7, #0
 	beq _02336564
-	ldr r0, _02335F38 ; =ov29_0237C850
+	ldr r0, _02335F38 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #0x10
 	beq _02336550
@@ -857,7 +857,7 @@ _02336564:
 _0233656C:
 	cmp sb, #0
 	beq _023365A8_EU
-	ldr r0, _02335F38 ; =ov29_0237C850
+	ldr r0, _02335F38 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	ands r0, r0, #0x10
 	movne r8, #0x30
@@ -1280,7 +1280,7 @@ _02335A4C:
 	moveq fp, #1
 	cmp r6, #0
 	beq _02335B18
-	ldr r0, _02335F38 ; =ov29_0237C850
+	ldr r0, _02335F38 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	tst r0, #0x10
 	beq _02335B04
@@ -1301,7 +1301,7 @@ _02335B18:
 _02335B20:
 	cmp fp, #0
 	beq _02335B5C
-	ldr r0, _02335F38 ; =ov29_0237C850
+	ldr r0, _02335F38 ; =DUNGEON_FRAMES_PASSED
 	ldr r0, [r0]
 	ands r0, r0, #0x10
 	movne sl, #0x30
@@ -1581,7 +1581,7 @@ _02335F24:
 _02335F2C: .word DUNGEON_PTR
 _02335F30: .word ov29_0237CA8C
 _02335F34: .word 0x000003E7
-_02335F38: .word ov29_0237C850
+_02335F38: .word DUNGEON_FRAMES_PASSED
 _02335F3C: .word _020AFC70
 	arm_func_end DisplayUi

--- a/asm/overlay_29_02336450.s
+++ b/asm/overlay_29_02336450.s
@@ -1254,7 +1254,7 @@ _02337544:
 	bne _023375DC
 	ldr r0, [sp, #0x20]
 	add r1, sp, #0x28
-	bl ov29_022E2930
+	bl CanSeePosition
 	cmp r0, #0
 	beq _023375DC
 	mov r0, #0
@@ -1370,7 +1370,7 @@ _023376A8:
 	bne _0233772C
 	ldr r0, [sp, #0x20]
 	add r1, sp, #0x28
-	bl ov29_022E2930
+	bl CanSeePosition
 	cmp r0, #0
 	beq _0233772C
 	mov r0, #0
--- a/asm/overlay_29_023498A0.s
+++ b/asm/overlay_29_023498A0.s
@@ -681,7 +681,7 @@ _0234A1CC:
 _0234A1D4:
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldr r0, _0234A200 ; =ov29_023537C8
 	ldr r0, [r0]
 	cmp r0, #0
@@ -984,7 +984,7 @@ _0234A570:
 	bl ov29_0234AF34
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234A5A8:
 	add sp, sp, #0x24
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -1109,7 +1109,7 @@ _0234A6B8:
 	bl ov29_0234AF34
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234A738:
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -1229,7 +1229,7 @@ _0234A890:
 _0234A898:
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234A8A4:
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
@@ -1301,7 +1301,7 @@ _0234A958:
 	bl ov29_02348888
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 #ifdef JAPAN
@@ -1377,7 +1377,7 @@ _0234A9DC:
 	bl ov29_0234AF34
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234AA78:
 	add sp, sp, #0x10
 	ldmia sp!, {r3, r4, r5, pc}
@@ -1470,7 +1470,7 @@ _0234AAC4:
 	bl ov29_0234AF34
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234AB94:
 	add sp, sp, #0x10
 	ldmia sp!, {r4, r5, r6, pc}
@@ -1557,7 +1557,7 @@ _0234AC68:
 _0234AC70:
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldmia sp!, {r4, pc}
 	.align 2, 0
 #ifdef JAPAN
--- a/asm/overlay_29_0234AEE8.s
+++ b/asm/overlay_29_0234AEE8.s
@@ -312,7 +312,7 @@ _0234B1C4:
 	ldmeqia sp!, {r4, pc}
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #0xb
 	bl AdvanceFrame
 	ldmia sp!, {r4, pc}
@@ -930,7 +930,7 @@ _0234B9C8:
 	bl ov29_0234B768
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldmia sp!, {r3, r4, r5, pc}
 	.align 2, 0
 _0234BA14: .word MESSAGE_LOG_INFO
@@ -1073,7 +1073,7 @@ OpenMessageLog: ; 0x0234BB5C
 	mov r6, r1
 	mov r0, #6
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	cmp r4, #0
 	bne _0234BB84
 	mov r0, #0
@@ -1097,7 +1097,7 @@ _0234BB9C:
 	beq _0234BBCC
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234BBCC:
 	cmp r5, #1
 	moveq r0, #1
--- a/asm/overlay_29_0234CA84.s
+++ b/asm/overlay_29_0234CA84.s
@@ -640,7 +640,7 @@ DisplayMessage: ; 0x0234D258
 	bl DisplayMessageInternal
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add sp, sp, #8
 	ldmia sp!, {r4, r5, r6, pc}
 	arm_func_end DisplayMessage
@@ -666,7 +666,7 @@ DisplayMessage2: ; 0x0234D2AC
 	bl DisplayMessageInternal
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add sp, sp, #8
 	ldmia sp!, {r4, r5, r6, pc}
 	arm_func_end DisplayMessage2
@@ -761,7 +761,7 @@ _0234D41C:
 _0234D440:
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add sp, sp, #0x58
 	ldmia sp!, {r4, r5, r6, r7, r8, pc}
 	.align 2, 0
--- a/asm/overlay_29_0234D484.s
+++ b/asm/overlay_29_0234D484.s
@@ -75,7 +75,7 @@ ov29_0234D558: ; 0x0234D558
 	mov r4, r0
 	mov r0, #2
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	cmp r4, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, #0
@@ -115,7 +115,7 @@ ov29_0234D5D0: ; 0x0234D5D0
 	mov r1, #0
 	mov r5, r2
 	mov r4, r3
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ov29_0234B4CC
 	bl ov29_0234DB58
@@ -139,7 +139,7 @@ ov29_0234D630: ; 0x0234D630
 	stmdb sp!, {r3, lr}
 	mov r0, #2
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ov29_0234B4CC
 	bl ov29_0234DB58
@@ -427,7 +427,7 @@ _0234D994:
 	beq _0234D9A8
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234D9A8:
 	bl sub_02006B70
 	bl ov29_022E0B44
--- a/asm/overlay_29_0234DDF4.s
+++ b/asm/overlay_29_0234DDF4.s
@@ -38,7 +38,7 @@ OpenMenu: ; 0x0234DDF4
 	bl AdvanceFrame
 	mov r0, #2
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #2
 	mov r1, #0x1d
 	bl ov29_022EA370
@@ -55,7 +55,7 @@ _0234DE78:
 	bl ov29_0234B1A4
 	mov r0, #2
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ResetLeaderActionFields
 	ldr r0, _0234E8EC ; =ov29_02382804
@@ -730,7 +730,7 @@ _0234E800:
 	bne _0234E834
 	mov r0, #2
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl OthersMenu
 	cmp r0, #0
 	bne _0234E890
@@ -771,13 +771,13 @@ _0234E890:
 	bl AdvanceFrame
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	b _0234E8C0
 _0234E8B0:
 	bl AdvanceFrame
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234E8C0:
 #ifdef EUROPE
 	mov r0, #0
--- a/asm/overlay_29_0234EC38.s
+++ b/asm/overlay_29_0234EC38.s
@@ -300,7 +300,7 @@ DungeonModeSetupAndShowNameKeyboard: ; 0x0234F008
 	mov r1, r4
 	mov r0, #8
 	mov r5, r2
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldr r0, _0234F1D8 ; =ov29_0235352C
 	ldr r0, [r0]
 	ldr r0, [r0, #0x24]
@@ -419,7 +419,7 @@ _0234F1A0:
 	beq _0234F1CC
 	mov r0, #0
 	mov r1, r0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _0234F1CC:
 	mov r0, #1
 	add sp, sp, #0x40
--- a/asm/overlay_29_bss_02353860.s
+++ b/asm/overlay_29_bss_02353860.s
@@ -76,8 +76,8 @@ ov29_0237C79C:
 	.global ov29_0237C84C
 ov29_0237C84C:
 	.space 0x4
-	.global ov29_0237C850
-ov29_0237C850:
+	.global DUNGEON_FRAMES_PASSED
+DUNGEON_FRAMES_PASSED:
 	.space 0x14
 	.global ov29_0237C864
 ov29_0237C864:
--- a/asm/overlay_31_023838E4.s
+++ b/asm/overlay_31_023838E4.s
@@ -131,7 +131,7 @@ _02383A74:
 	bl ov31_023837C8
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	b _0238511C
 _02383AC4:
@@ -825,7 +825,7 @@ _02384490:
 	bne _023844AC
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #1
 	b _023850D8
 _023844AC:
@@ -837,7 +837,7 @@ _023844AC:
 	bl ov29_022EBBE8
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #0
 	b _023850D8
 _023844D8:
@@ -847,7 +847,7 @@ _023844D8:
 	bl ov29_022EBB68
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #0
 	b _023850D8
 _023844FC:
@@ -1538,7 +1538,7 @@ _02384E30:
 	bne _02384E90
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #1
 	b _023850D8
 _02384E90:
@@ -1552,7 +1552,7 @@ _02384E90:
 	mov r0, #0xb
 	mov r1, #0
 	strb r2, [r7, #0x4e]
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #0
 	b _023850D8
 _02384EC4:
@@ -1606,13 +1606,13 @@ _02384F34:
 	mov r0, #0
 	mov r1, r0
 	strb r2, [r7, #0x54]
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #0
 	b _023850D8
 _02384F88:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ResetLeaderActionFields
 	b _02383B08
@@ -1695,20 +1695,20 @@ _02385028:
 #else
 	strb r2, [r7, #0x23c]
 #endif
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #0
 	b _023850D8
 _023850B0:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #1
 	bl ResetLeaderActionFields
 	b _02383B08
 _023850C8:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r5, #0
 _023850D8:
 	ldr r0, _023848A8 ; =DUNGEON_PTR
@@ -1864,7 +1864,7 @@ _0238529C:
 	bne _023852CC
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl GetLeaderAction
 	mov r1, #0
 	bl ov31_023860A4
@@ -1877,7 +1877,7 @@ _023852CC:
 	bne _023852FC
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl GetLeaderAction
 	mov r1, #0
 	bl ov31_023860A4
@@ -1890,7 +1890,7 @@ _023852FC:
 	bne _02385328
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl GetLeaderAction
 	bl ov31_0238619C
 	mov r0, #1
@@ -1902,7 +1902,7 @@ _02385328:
 	bne _02385354
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl GetLeaderAction
 	bl ov31_02386204
 	mov r0, #1
@@ -1914,7 +1914,7 @@ _02385354:
 	bne _02385380
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl GetLeaderAction
 	mov r1, #1
 	bl ov31_02386308
@@ -2194,7 +2194,7 @@ _023856D0:
 	bl ov29_022EBC2C
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #8
 	mov r1, #0x1b
 	bl ov29_022EA370
@@ -3410,7 +3410,7 @@ ov31_0238647C: ; 0x0238647C
 _023864B4:
 	mov r0, #6
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	ldr r0, _02386B10 ; =ov29_0235352C
 	ldr r0, [r0]
 	ldr r0, [r0, #0x24]
@@ -3532,7 +3532,7 @@ _02386674:
 	bl sub_020407C0
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #2
 	mov r1, #0x1b
 	bl ov29_022EA370
@@ -3637,7 +3637,7 @@ _023867A0:
 _023867F8:
 	mov r0, #6
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, r4
 	bl SetAdvancedTextBoxState5
 _0238680C:
@@ -4114,7 +4114,7 @@ _02386E3C:
 	bl CloseScrollBox
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 _02386E68:
 	mov r6, #2
 	b _02386EBC
@@ -4157,7 +4157,7 @@ _02386EBC:
 _02386EF8:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	add sp, sp, #0xf4
 	ldmia sp!, {r3, r4, r5, r6, pc}
 	.align 2, 0
@@ -4647,7 +4647,7 @@ _023875D8:
 _023875F0:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	bl ov31_02386F2C
 	mov r0, #0x1b
 	bl AdvanceFrame
@@ -4774,7 +4774,7 @@ _0238775C:
 _0238776C:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, sb
 	bl ov29_023021F0
 	add sp, sp, #0x78
@@ -5459,7 +5459,7 @@ _02387FEC:
 _0238800C:
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #4
 	mov r1, #0x3e
 	bl ov29_022EA370
@@ -8127,7 +8127,7 @@ _02389D1C:
 	bl CloseScrollBox
 	mov r0, #0xb
 	mov r1, #0
-	bl ov29_022EA428
+	bl UnkMapRelatedFunc
 	mov r0, #4
 	mov r1, #0x3e
 	bl ov29_022EA370
--- a/src/overlay_31_02382820.c
+++ b/src/overlay_31_02382820.c
@@ -52,7 +52,7 @@ extern struct struct_1* GetSimpleMenuResult__0202AEA4(s8);
 extern void CloseTextBox(s8);
 extern void CloseParentMenu(s8);

-extern void ov29_022EA428(u32, u32);
+extern void UnkMapRelatedFunc(u32, u32);
 extern void AdvanceFrame(u8);
 extern u32 GetLeaderActionId(void);
 extern void ov29_022E0C2C(u32);
@@ -247,7 +247,7 @@ struct struct_1* ov31_02382E08(void)

 void StairsMenu(struct entity* arg_1, u32 arg_2)
 {
-    ov29_022EA428(6, 0);
+    UnkMapRelatedFunc(6, 0);
    AdvanceFrame(0x62);
    AdvanceFrame(0x62);
    CreateStairsMenuState(arg_1);
@@ -259,11 +259,11 @@ void StairsMenu(struct entity* arg_1, u32 arg_2)
    AdvanceFrame(0x62);

    if (GetLeaderActionId()) {
-        ov29_022EA428(11, 0);
+        UnkMapRelatedFunc(11, 0);
    } else if (arg_2) {
-        ov29_022EA428(11, 0);
+        UnkMapRelatedFunc(11, 0);
    } else {
-        ov29_022EA428(0, 0);
+        UnkMapRelatedFunc(0, 0);
    }
    ov29_022E0C2C(1);
 }