Synced from pmdsky-debug

2026-09-29 21:57:42 -05:00 · 2023-11-28 17:47:17 -05:00
parent 67f3ab5225
commit 4c60e86fb8
27 changed files with 86 additions and 86 deletions
--- a/asm/include/main_02000C6C.inc
+++ b/asm/include/main_02000C6C.inc
@@ -203,6 +203,7 @@
 .public PRNG_SEQUENCE_NUM
 .public sprintf
 .public sqrtf
+.public StartThread
 .public StopBgmCommand
 .public strcat
 .public strcmp
@@ -272,7 +273,6 @@
 .public sub_02078A98
 .public sub_02078C68
 .public sub_0207902C
-.public sub_02079560
 .public sub_02079844
 .public sub_02079888
 .public sub_02079940
--- a/asm/include/overlay_00.inc
+++ b/asm/include/overlay_00.inc
@@ -67,6 +67,7 @@
 .public SetIrqFlag
 .public snprintf
 .public sprintf
+.public StartThread
 .public strcat
 .public strchr
 .public strcmp
@@ -141,8 +142,6 @@
 .public sub_020790DC
 .public sub_0207911C
 .public sub_02079550
-.public sub_02079560
-.public sub_0207965C
 .public sub_0207976C
 .public sub_02079800
 .public sub_02079830
@@ -236,6 +235,7 @@
 .public sub_0208FE3C
 .public sub_020902AC
 .public SVC_WaitByLoop
+.public ThreadExit
 .public UnloadOverlay
 .public WaitForever2
 .public wcslen
--- a/asm/include/overlay_02.inc
+++ b/asm/include/overlay_02.inc
@@ -102,6 +102,7 @@
 .public ov00_02318160
 .public ov00_023250C8
 .public SetIrqFlag
+.public StartThread
 .public strcpy
 .public strlen
 .public strncpy
@@ -175,7 +176,6 @@
 .public sub_020790DC
 .public sub_0207911C
 .public sub_02079550
-.public sub_02079560
 .public sub_02079800
 .public sub_02079830
 .public sub_02079940
--- a/asm/include/overlay_29_022E37DC.inc
+++ b/asm/include/overlay_29_022E37DC.inc
@@ -9,6 +9,7 @@
 .public CheckSpawnThreshold
 .public CreateTextBox1
 .public DIRECTIONS_XY
+.public DisplayAnimatedNumbers
 .public DUNGEON_PTR
 .public DungeonFloorToGroupFloor
 .public DungeonGetSpriteIndex
@@ -86,7 +87,6 @@
 .public ov29_022DE5F0
 .public ov29_022E2CA0
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022EACCC
 .public ov29_022EACE4
 .public ov29_022ED0F4
--- a/asm/include/overlay_29_022F7388.inc
+++ b/asm/include/overlay_29_022F7388.inc
@@ -19,6 +19,7 @@
 .public DeleteWanTableEntryVeneer
 .public DIRECTIONS_XY
 .public DiscoverMinimap
+.public DisplayAnimatedNumbers
 .public DisplayMessage
 .public DisplayMessage2
 .public DrawMinimapTile
@@ -147,7 +148,6 @@
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022ECDE4
 .public ov29_022EF7C4
 .public ov29_022EF938
--- a/asm/include/overlay_29_02308FE0.inc
+++ b/asm/include/overlay_29_02308FE0.inc
@@ -37,6 +37,7 @@
 .public DebugRecruitingEnabled
 .public DEF_SCARF_STAT_BOOST
 .public DEFENSIVE_STAT_STAGE_MULTIPLIERS
+.public DisplayAnimatedNumbers
 .public DivideFixedPoint64
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -161,7 +162,6 @@
 .public ov29_022E81F8
 .public ov29_022E9628
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022EACAC
 .public ov29_022EAF20
 .public ov29_022EAF34
--- a/asm/include/overlay_29_0231513C.inc
+++ b/asm/include/overlay_29_0231513C.inc
@@ -9,6 +9,7 @@
 .public BoostOffensiveStat
 .public CalcStatusDuration
 .public CeilFixedPoint
+.public DisplayAnimatedNumbers
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonRandInt
@@ -112,7 +113,6 @@
 .public ov29_022E4AF0
 .public ov29_022E4B3C
 .public ov29_022E81F8
-.public ov29_022EA718
 .public ov29_022EACCC
 .public ov29_022FB984
 .public ov29_02304830
--- a/asm/include/overlay_29_0231CBEC.inc
+++ b/asm/include/overlay_29_0231CBEC.inc
@@ -39,6 +39,8 @@
 .public GINSENG_CHANCE_3
 .public GUMMI_BELLY_RESTORE_TABLE
 .public GUMMI_LIKE_STRING_IDS
+.public HandleMovesMenuWrapper0
+.public HandleMovesMenuWrapper1
 .public HandleSir0Translation
 .public InitMove
 .public IQ_GUMMI_GAIN_TABLE
@@ -110,8 +112,6 @@
 .public ov29_023529AC
 .public ov29_023529B0
 .public ov29_02353324
-.public ov31_023853BC
-.public ov31_023853E0
 .public ov31_02385FE0
 .public ov31_023860A4
 .public ov31_0238619C
--- a/asm/include/overlay_29_0232C524.inc
+++ b/asm/include/overlay_29_0232C524.inc
@@ -65,7 +65,6 @@
 .public ov29_022E1AAC
 .public ov29_022E1AD4
 .public ov29_022E1EF8
-.public ov29_022E3430
 .public ov29_022E34A8_EU
 .public ov29_022E6770
 .public ov29_022E6784
@@ -102,6 +101,7 @@
 .public RevealEnemies
 .public RevealItems
 .public RevealStairs
+.public RevealWholeFloor
 .public ROOST_HP_RESTORATION_TABLE
 .public SHADOW_FORCE_DAMAGE_MULTIPLIER
 .public SLEEP_TURN_RANGE
--- a/asm/include/overlay_29_0232E864.inc
+++ b/asm/include/overlay_29_0232E864.inc
@@ -14,6 +14,7 @@
 .public Conversion2IsActive
 .public CreateMainMenus
 .public DIRECTIONS_XY
+.public DisplayAnimatedNumbers
 .public DoMoveAbsorb
 .public DoMoveAcupressure
 .public DoMoveAmnesia
@@ -386,7 +387,6 @@
 .public ov29_022E6388
 .public ov29_022E6424
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022EDC30
 .public ov29_022F9840
 .public ov29_022FB1A8
--- a/asm/include/overlay_29_0234DDF4.inc
+++ b/asm/include/overlay_29_0234DDF4.inc
@@ -13,6 +13,7 @@
 .public GetLeaderAction
 .public GetLeaderMonster
 .public GetTile
+.public HandleMovesMenuWrapper0
 .public HideTileGrid
 .public InitMove
 .public LoadOverlay
@@ -45,7 +46,6 @@
 .public ov31_02382E18
 .public ov31_0238367C
 .public ov31_023838E4
-.public ov31_023853BC
 .public ov31_02385FE0
 .public ov31_023860A4
 .public ov31_0238619C
--- a/asm/main_02000C6C.s
+++ b/asm/main_02000C6C.s
@@ -2199,7 +2199,7 @@ sub_02002778: ; 0x02002778
 	ldmia ip, {r1, lr}
 	ldr r0, [r4]
 	add r3, lr, r3
-	bl sub_02079560
+	bl StartThread
 	mov r0, r4
 	bl sub_020026E4
 	add sp, sp, #8
--- a/asm/main_0200C4CC.s
+++ b/asm/main_0200C4CC.s
@@ -119785,7 +119785,7 @@ sub_0206CD9C: ; 0x0206CD9C
 	add r3, r2, #0x800
 	ldr r1, _0206CE24 ; =sub_0206CE68
 	mov r2, #0
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _0206CE20 ; =_022B9120
 	bl sub_02079940
 	add sp, sp, #8
@@ -123784,7 +123784,7 @@ sub_020701F8: ; 0x020701F8
 	ldr r3, [r2, #0x34]
 	mov r2, #0
 	add r3, r3, #0x400
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _02070284 ; =_022B94BC
 	bl sub_02079940
 	mov r0, #0
@@ -124664,7 +124664,7 @@ sub_02070E0C: ; 0x02070E0C
 	ldr r3, [r2, #0xdd4]
 	mov r2, #0
 	add r3, r3, #0x800
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _02070E98 ; =_022B9044
 	bl sub_02079940
 	bl sub_02070EDC
@@ -135217,8 +135217,8 @@ sub_02079144: ; 0x02079144
 _0207914C: .word sub_02085BD4
 	arm_func_end sub_02079144

-	arm_func_start sub_02079150
-sub_02079150: ; 0x02079150
+	arm_func_start IncrementThreadCount
+IncrementThreadCount: ; 0x02079150
 	ldr r1, _02079164 ; =_022B9648
 	ldr r0, [r1, #0x20]
 	add r0, r0, #1
@@ -135226,7 +135226,7 @@ sub_02079150: ; 0x02079150
 	bx lr
 	.align 2, 0
 _02079164: .word _022B9648
-	arm_func_end sub_02079150
+	arm_func_end IncrementThreadCount

 	arm_func_start sub_02079168
 sub_02079168: ; 0x02079168
@@ -135329,8 +135329,8 @@ _02079290:
 	bx lr
 	arm_func_end sub_02079268

-	arm_func_start sub_02079298
-sub_02079298: ; 0x02079298
+	arm_func_start InsertThreadIntoList
+InsertThreadIntoList: ; 0x02079298
 	stmdb sp!, {r3, lr}
 	ldr r1, _020792F4 ; =_022B9648
 	mov ip, #0
@@ -135359,7 +135359,7 @@ _020792D0:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _020792F4: .word _022B9648
-	arm_func_end sub_02079298
+	arm_func_end InsertThreadIntoList

 	arm_func_start sub_020792F8
 sub_020792F8: ; 0x020792F8
@@ -135509,7 +135509,7 @@ _0207947C:
 	ldr r3, _0207954C ; =_022B98C4
 	mov r2, #0
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _02079518 ; =_022B9648
 	mov r1, #0x20
 	str r1, [r0, #0xa4]
@@ -135543,8 +135543,8 @@ sub_02079550: ; 0x02079550
 _0207955C: .word _022B9654
 	arm_func_end sub_02079550

-	arm_func_start sub_02079560
-sub_02079560: ; 0x02079560
+	arm_func_start StartThread
+StartThread: ; 0x02079560
 	stmdb sp!, {r4, r5, r6, r7, r8, lr}
 	mov r8, r0
 	mov r5, r1
@@ -135552,7 +135552,7 @@ sub_02079560: ; 0x02079560
 	mov r6, r3
 	bl EnableIrqFlag
 	mov r4, r0
-	bl sub_02079150
+	bl IncrementThreadCount
 	ldr r2, [sp, #0x1c]
 	mov r1, #0
 	str r2, [r8, #0x70]
@@ -135560,7 +135560,7 @@ sub_02079560: ; 0x02079560
 	str r1, [r8, #0x64]
 	mov r0, r8
 	str r1, [r8, #0x74]
-	bl sub_02079298
+	bl InsertThreadIntoList
 	ldr r0, [sp, #0x18]
 	mov r1, r5
 	str r6, [r8, #0x94]
@@ -135578,8 +135578,8 @@ sub_02079560: ; 0x02079560
 	str ip, [r8, #0xa0]
 	mov r0, r8
 	str ip, [r8, #0x9c]
-	bl sub_02079C84
-	ldr r2, _02079658 ; =sub_0207965C
+	bl InitThread
+	ldr r2, _02079658 ; =ThreadExit
 	str r7, [r8, #4]
 	str r2, [r8, #0x3c]
 	ldr r2, [sp, #0x18]
@@ -135592,7 +135592,7 @@ sub_02079560: ; 0x02079560
 	str r1, [r8, #0x88]
 	mov r0, r8
 	str r1, [r8, #0x8c]
-	bl sub_02079C7C
+	bl SetThreadField0xB4
 	mov r0, #0
 	str r0, [r8, #0x78]
 	str r0, [r8, #0x80]
@@ -135608,11 +135608,11 @@ sub_02079560: ; 0x02079560
 	.align 2, 0
 _02079650: .word 0xFDDB597D
 _02079654: .word 0x7BF9DD5B
-_02079658: .word sub_0207965C
-	arm_func_end sub_02079560
+_02079658: .word ThreadExit
+	arm_func_end StartThread

-	arm_func_start sub_0207965C
-sub_0207965C: ; 0x0207965C
+	arm_func_start ThreadExit
+ThreadExit: ; 0x0207965C
 	stmdb sp!, {r3, lr}
 	bl EnableIrqFlag
 	ldr r0, _02079678 ; =_022B9648
@@ -135622,7 +135622,7 @@ sub_0207965C: ; 0x0207965C
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _02079678: .word _022B9648
-	arm_func_end sub_0207965C
+	arm_func_end ThreadExit

 	arm_func_start sub_0207967C
 sub_0207967C: ; 0x0207967C
@@ -135634,7 +135634,7 @@ sub_0207967C: ; 0x0207967C
 	cmp r2, #0
 	beq _020796C4
 	ldr r1, _020796D4 ; =sub_020796D8
-	bl sub_02079C84
+	bl InitThread
 	str r4, [r5, #4]
 	ldr r1, [r5]
 	mov r0, r5
@@ -135995,7 +135995,7 @@ _02079ABC:
 _02079AE4:
 	mov r0, r7
 	str r6, [r7, #0x70]
-	bl sub_02079298
+	bl InsertThreadIntoList
 	bl sub_02079340
 _02079AF4:
 	mov r0, r5
@@ -136135,14 +136135,14 @@ sub_02079C48: ; 0x02079C48
 _02079C78: .word _022B9648
 	arm_func_end sub_02079C48

-	arm_func_start sub_02079C7C
-sub_02079C7C: ; 0x02079C7C
+	arm_func_start SetThreadField0xB4
+SetThreadField0xB4: ; 0x02079C7C
 	str r1, [r0, #0xb4]
 	bx lr
-	arm_func_end sub_02079C7C
+	arm_func_end SetThreadField0xB4

-	arm_func_start sub_02079C84
-sub_02079C84: ; 0x02079C84
+	arm_func_start InitThread
+InitThread: ; 0x02079C84
 	add r1, r1, #4
 	str r1, [r0, #0x40]
 	str r2, [r0, #0x44]
@@ -136182,7 +136182,7 @@ _02079CC4:
 	str r1, [r0, #0x34]
 	str r1, [r0, #0x3c]
 	bx lr
-	arm_func_end sub_02079C84
+	arm_func_end InitThread

 	arm_func_start sub_02079D08
 sub_02079D08: ; 0x02079D08
@@ -147994,7 +147994,7 @@ _020832BC:
 	ldr r3, _02083350 ; =_022BBE00
 	add r0, r4, #0x44
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	add r0, r4, #0x44
 	bl sub_02079940
 	ldr r1, _02083354 ; =sub_02084380
@@ -150120,7 +150120,7 @@ sub_02084DA4: ; 0x02084DA4
 	mov r2, #0x14
 	str r2, [sp, #4]
 	mov r2, r5
-	bl sub_02079560
+	bl StartThread
 	mov r0, r5
 	bl sub_02079940
 _02084E10:
@@ -150209,7 +150209,7 @@ _02084F04:
 	bl SetIrqFlag
 	b _02084E68
 _02084F24:
-	bl sub_0207965C
+	bl ThreadExit
 	add sp, sp, #0x24
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
--- a/asm/overlay_00.s
+++ b/asm/overlay_00.s
@@ -13474,7 +13474,7 @@ _022C7B8C:
 	bl SetIrqFlag
 	b _022C7A9C
 _022C7BA4:
-	bl sub_0207965C
+	bl ThreadExit
 	ldmia sp!, {r3, r4, r5, r6, r7, pc}
 	arm_func_end ov00_022C7A94

@@ -13503,7 +13503,7 @@ ov00_022C7BAC: ; 0x022C7BAC
 	mov r2, r5
 	add r3, r3, ip
 	stmia sp, {ip, lr}
-	bl sub_02079560
+	bl StartThread
 	mov r0, r5
 	bl sub_02079940
 _022C7C14:
@@ -14137,7 +14137,7 @@ _022C8324:
 	ldr r0, _022C8494 ; =ov00_023252E0
 	ldr r3, _022C8498 ; =ov00_023268C0
 	str r4, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	mov r1, #0x800
 	ldr r0, _022C848C ; =ov00_02318844
 	str r1, [sp]
@@ -14147,7 +14147,7 @@ _022C8324:
 	ldr r1, _022C84A0 ; =ov00_022CBC40
 	ldr r3, _022C84A4 ; =ov00_023260C0
 	mov r2, #0
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _022C8494 ; =ov00_023252E0
 	bl sub_02079940
 	ldr r0, _022C849C ; =ov00_02325220
@@ -20296,7 +20296,7 @@ ov00_022CD61C: ; 0x022CD61C
 	mov r2, r6
 	add r3, r7, r4
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	add r0, r6, #0x20
 	bl sub_02079940
 	add r0, r7, r4
@@ -37905,7 +37905,7 @@ _022DBE24:
 	add r0, r0, #0x1000
 	add r3, lr, #0x1000
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _022DBE70 ; =ov00_02326CB4
 	ldr r0, [r0, #8]
 	add r0, r0, #0x318
@@ -39382,7 +39382,7 @@ _022DD30C:
 	add r0, r0, #0x1800
 	add r3, r5, #0x1000
 	str r4, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	add r0, r5, #0x338
 	add r0, r0, #0x1800
 	bl sub_02079940
@@ -40863,7 +40863,7 @@ _022DE74C:
 	add r0, r0, #0x1000
 	add r3, r2, #0x1000
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _022DE794 ; =ov00_02326CD8
 	ldr r0, [r0]
 	add r0, r0, #0x11c
@@ -44052,7 +44052,7 @@ _022E123C:
 	add r3, r3, #0x9c0
 	mov r2, #0
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _022E1284 ; =ov00_02326D84
 	ldr r0, [r0]
 	add r0, r0, #0x9c0
@@ -63022,7 +63022,7 @@ ov00_022F13A0: ; 0x022F13A0
 	str ip, [sp]
 	mov ip, #0x10
 	str ip, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _022F13DC ; =ov00_02327964
 	bl sub_02079940
 	add sp, sp, #8
@@ -63494,7 +63494,7 @@ ov00_022F193C: ; 0x022F193C
 	add r3, r4, #0x2000
 	mov r2, #0
 	str r5, [sp, #4]
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _022F19AC ; =ov00_02328260
 	bl sub_02079940
 	mov r0, #1
--- a/asm/overlay_02.s
+++ b/asm/overlay_02.s
@@ -18896,7 +18896,7 @@ _0233426C:
 	bic r3, r4
 	mov r2, #0
 	add r3, r5, r3
-	bl sub_02079560
+	bl StartThread
 	ldr r0, _023342C8 ; =ov02_023594D0
 	mov r1, #1
 	str r1, [r0, #0x38]
--- a/asm/overlay_29_022E330C.s
+++ b/asm/overlay_29_022E330C.s
@@ -92,8 +92,8 @@ _022E3428: .word DUNGEON_PTR
 _022E342C: .word 0x000003E7
 	arm_func_end ov29_022E335C

-	arm_func_start ov29_022E3430
-ov29_022E3430: ; 0x022E3430
+	arm_func_start RevealWholeFloor
+RevealWholeFloor: ; 0x022E3430
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}
 	ldr r1, _022E34A8 ; =DUNGEON_PTR
 	mov r7, #0
@@ -129,7 +129,7 @@ _022E3458:
 	.align 2, 0
 _022E34A8: .word DUNGEON_PTR
 _022E34AC: .word 0x00000B77
-	arm_func_end ov29_022E3430
+	arm_func_end RevealWholeFloor

 	arm_func_start ov29_022E34B0
 ov29_022E34B0: ; 0x022E34B0
--- a/asm/overlay_29_022E37DC.s
+++ b/asm/overlay_29_022E37DC.s
@@ -1267,7 +1267,7 @@ ov29_022E46D4: ; 0x022E46D4
 	ldrb r0, [r0, #0x11e]
 	mov r2, #1
 	mov r3, #0xb
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 	ldmia sp!, {r4, pc}
 	arm_func_end ov29_022E46D4

--- a/asm/overlay_29_022E9618.s
+++ b/asm/overlay_29_022E9618.s
@@ -1297,8 +1297,8 @@ _022EA710: .word _020AFC4C
 _022EA714: .word 0x000001EA
 	arm_func_end ov29_022EA64C

-	arm_func_start ov29_022EA718
-ov29_022EA718: ; 0x022EA718
+	arm_func_start DisplayAnimatedNumbers
+DisplayAnimatedNumbers: ; 0x022EA718
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	movs sl, r0
 	mov sb, r1
@@ -1367,7 +1367,7 @@ _022EA7FC: .word DUNGEON_PTR
 _022EA800: .word ov29_0237C850
 _022EA804: .word ov29_02353560
 _022EA808: .word 0xFFFFFC19
-	arm_func_end ov29_022EA718
+	arm_func_end DisplayAnimatedNumbers

 	arm_func_start ov29_022EA80C
 ov29_022EA80C: ; 0x022EA80C
--- a/asm/overlay_29_022F7388.s
+++ b/asm/overlay_29_022F7388.s
@@ -5381,7 +5381,7 @@ ov29_022FB98C: ; 0x022FB98C
 	ldr r0, _022FB9B8 ; =0x0000270F
 	mov r4, r1
 	sub r3, r2, #2
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 	mov r0, r5
 	mov r1, r4
 	bl ov29_022E576C
--- a/asm/overlay_29_02308FE0.s
+++ b/asm/overlay_29_02308FE0.s
@@ -547,7 +547,7 @@ _0230A16C:
 	mov r1, sb
 	rsb r0, r0, #0
 	sub r3, r2, #2
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 _0230A1E8:
 	ldrb r0, [r7, #0x15c]
 	cmp r0, #0
@@ -1627,7 +1627,7 @@ _02309740:
 	mov r1, r7
 	rsb r0, r0, #0
 	sub r3, r2, #2
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 _023097BC:
 	ldrb r0, [r4, #0x15c]
 	cmp r0, #0
--- a/asm/overlay_29_0231513C.s
+++ b/asm/overlay_29_0231513C.s
@@ -334,7 +334,7 @@ _023155C8:
 	mov r0, r4
 	mov r1, r6
 	sub r3, r2, #2
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 _023155E4:
 	mov r0, #0
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
--- a/asm/overlay_29_0231CBEC.s
+++ b/asm/overlay_29_0231CBEC.s
@@ -1369,14 +1369,14 @@ _0231DE6C:
 	mov r1, r8
 	mov r3, r2
 	str r8, [sp]
-	bl ov31_023853BC
+	bl HandleMovesMenuWrapper0
 	b _0231DEB0
 _0231DE9C:
 	mov r0, r7
 	mov r1, fp
 	mov r3, r2
 	str fp, [sp]
-	bl ov31_023853E0
+	bl HandleMovesMenuWrapper1
 _0231DEB0:
 	cmp r0, #0
 	beq _0231DF1C
--- a/asm/overlay_29_0232C524.s
+++ b/asm/overlay_29_0232C524.s
@@ -394,7 +394,7 @@ DoMoveSlowDown: ; 0x0232CA14
 	arm_func_start DoMoveSearchlight
 DoMoveSearchlight: ; 0x0232CA2C
 	stmdb sp!, {r3, lr}
-	bl ov29_022E3430
+	bl RevealWholeFloor
 	mov r0, #1
 	ldmia sp!, {r3, pc}
 	arm_func_end DoMoveSearchlight
--- a/asm/overlay_29_0232E864.s
+++ b/asm/overlay_29_0232E864.s
@@ -912,7 +912,7 @@ _0232F598:
 	mov r1, r4
 	mov r2, #1
 	sub r3, r2, #2
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 _0232F5BC:
 	cmp r6, #0xcc
 	beq _0232F5EC
@@ -4942,7 +4942,7 @@ _02332E3C:
 	ldr r0, _02332F10 ; =0x0000270F
 	mov r1, r7
 	sub r3, r2, #2
-	bl ov29_022EA718
+	bl DisplayAnimatedNumbers
 	ldr r2, _02332F14 ; =0x00000EC3
 	mov r0, r8
 	mov r1, r7
--- a/asm/overlay_29_02337CCC.s
+++ b/asm/overlay_29_02337CCC.s
@@ -3238,8 +3238,8 @@ LoadFixedRoomDataVeneer: ; 0x0233A624
 _0233A62C: .word LoadFixedRoomData
 	arm_func_end LoadFixedRoomDataVeneer

-	arm_func_start ov29_0233A630
-ov29_0233A630: ; 0x0233A630
+	arm_func_start UnloadFixedRoomData
+UnloadFixedRoomData: ; 0x0233A630
 	stmdb sp!, {r3, lr}
 	bl ov29_02343DD8
 	ldr r0, _0233A650 ; =DUNGEON_PTR
@@ -3250,7 +3250,7 @@ ov29_0233A630: ; 0x0233A630
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _0233A650: .word DUNGEON_PTR
-	arm_func_end ov29_0233A630
+	arm_func_end UnloadFixedRoomData

 	arm_func_start IsNormalFloor
 IsNormalFloor: ; 0x0233A654
@@ -3816,7 +3816,7 @@ _0233AE28:
 	bhi _0233AE58
 	bl ConvertWallsToChasms
 _0233AE58:
-	bl ov29_0233A630
+	bl UnloadFixedRoomData
 	add sp, sp, #0x54
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
 	.align 2, 0
--- a/asm/overlay_29_0234DDF4.s
+++ b/asm/overlay_29_0234DDF4.s
@@ -428,7 +428,7 @@ _0234E3CC:
 	mov r1, #0
 	mov r2, #1
 	str r7, [sp]
-	bl ov31_023853BC
+	bl HandleMovesMenuWrapper0
 	cmp r0, #0
 	movne r5, r8
 	bl ov29_022F0B9C
--- a/asm/overlay_31.s
+++ b/asm/overlay_31.s
@@ -3121,8 +3121,8 @@ _023853B0:
 _023853B8: .word DUNGEON_PTR
 	arm_func_end MovesMenu

-	arm_func_start ov31_023853BC
-ov31_023853BC: ; 0x023853BC
+	arm_func_start HandleMovesMenuWrapper0
+HandleMovesMenuWrapper0: ; 0x023853BC
 	stmdb sp!, {r3, lr}
 	sub sp, sp, #8
 	ldr lr, [sp, #0x10]
@@ -3132,10 +3132,10 @@ ov31_023853BC: ; 0x023853BC
 	bl HandleMovesMenu
 	add sp, sp, #8
 	ldmia sp!, {r3, pc}
-	arm_func_end ov31_023853BC
+	arm_func_end HandleMovesMenuWrapper0

-	arm_func_start ov31_023853E0
-ov31_023853E0: ; 0x023853E0
+	arm_func_start HandleMovesMenuWrapper1
+HandleMovesMenuWrapper1: ; 0x023853E0
 	stmdb sp!, {r3, lr}
 	sub sp, sp, #8
 	ldr lr, [sp, #0x10]
@@ -3145,7 +3145,7 @@ ov31_023853E0: ; 0x023853E0
 	bl HandleMovesMenu
 	add sp, sp, #8
 	ldmia sp!, {r3, pc}
-	arm_func_end ov31_023853E0
+	arm_func_end HandleMovesMenuWrapper1

 	arm_func_start HandleMovesMenu
 HandleMovesMenu: ; 0x02385404