diff --git a/asm/include/overlay_29_022E330C.inc b/asm/include/overlay_29_022E330C.inc
index d0920dbe..9a199ccd 100644
--- a/asm/include/overlay_29_022E330C.inc
+++ b/asm/include/overlay_29_022E330C.inc
@@ -15,9 +15,9 @@
 .public ov10_022BF8E8
 .public ov10_022BFD20
 .public ov29_022E2C6C
-.public ov29_022E5ED0
 .public ov29_0235110C
 .public ov29_0235354C
+.public ShouldDisplayEntityAdvanced
 .public sub_0201C000
 .public sub_0201CF90
 .public UpdateCamera
diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc
index b8dadd0e..d6a5a819 100644
--- a/asm/include/overlay_29_0232145C.inc
+++ b/asm/include/overlay_29_0232145C.inc
@@ -87,7 +87,6 @@
 .public ov29_022E3560
 .public ov29_022E56A0
 .public ov29_022E5864
-.public ov29_022E5ED0
 .public ov29_022E65A8
 .public ov29_022E6D68
 .public ov29_022EA370
@@ -134,6 +133,7 @@
 .public PositionHasMonster
 .public QUICK_DODGER_MOVE_ACCURACY_DROP
 .public SetAndLoadCurrentAttackAnimation
+.public ShouldDisplayEntityAdvanced
 .public ShouldDisplayEntityWrapper
 .public ShouldMovePlayAlternativeAnimation
 .public SLEEP_TURN_RANGE
diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc
index 6d4c3b18..60268993 100644
--- a/asm/include/overlay_29_02325644.inc
+++ b/asm/include/overlay_29_02325644.inc
@@ -67,7 +67,6 @@
 .public ov10_022C4C0E
 .public ov29_022E2CA0
 .public ov29_022E5474
-.public ov29_022E5ED0
 .public ov29_022E6D68
 .public ov29_022EA428
 .public ov29_02318BBC
@@ -88,6 +87,7 @@
 .public REVERSAL_DAMAGE_MULT_TABLE
 .public ROCK_SLIDE_CRINGE_CHANCE
 .public ROLLOUT_DAMAGE_MULT_TABLE
+.public ShouldDisplayEntityAdvanced
 .public SILVER_WIND_BOOST_CHANCE
 .public SKY_ATTACK_CRINGE_CHANCE
 .public SKY_ATTACK_DAMAGE_MULTIPLIER
diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc
index 52d6a480..b0ea9dd6 100644
--- a/asm/include/overlay_29_02328030.inc
+++ b/asm/include/overlay_29_02328030.inc
@@ -53,7 +53,6 @@
 .public ov10_022C4E44
 .public ov10_022C6324
 .public ov29_022E56A0
-.public ov29_022E5ED0
 .public ov29_022EA370
 .public ov29_022ECAFC
 .public ov29_022F9EA0
@@ -79,6 +78,7 @@
 .public RemoveEquivItemNoHole
 .public SACRED_FIRE_BURN_CHANCE
 .public SHADOW_BALL_LOWER_SPECIAL_DEFENSE_CHANCE
+.public ShouldDisplayEntityAdvanced
 .public SMOG_POISON_CHANCE
 .public SOLARBEAM_DAMAGE_MULTIPLIER
 .public SONICBOOM_FIXED_DAMAGE
diff --git a/asm/overlay_29_022E330C.s b/asm/overlay_29_022E330C.s
index 65d39d1d..bd0844d0 100644
--- a/asm/overlay_29_022E330C.s
+++ b/asm/overlay_29_022E330C.s
@@ -282,7 +282,7 @@ PlayEffectAnimationEntity: ; 0x022E35E4
 	beq _022E37A8
 	mov r0, r8
 	ldr r6, [r8, #0xb4]
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	mvneq r0, #0
 	beq _022E37A8
diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s
index 0e1a25ed..e2cead0d 100644
--- a/asm/overlay_29_022E37DC.s
+++ b/asm/overlay_29_022E37DC.s
@@ -1281,7 +1281,7 @@ ov29_022E46D0: ; 0x022E46D0
 ov29_022E46D4: ; 0x022E46D4
 	stmdb sp!, {r4, lr}
 	mov r4, r0
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	ldr r0, [r4, #0xb4]
@@ -2572,7 +2572,7 @@ ov29_022E56A0: ; 0x022E56A0
 	bl ov29_022EACCC
 	ldmia sp!, {r4, pc}
 _022E56BC:
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, r4
@@ -2602,7 +2602,7 @@ ov29_022E56F4: ; 0x022E56F4
 	bl ov29_022EACE4
 	ldmia sp!, {r4, pc}
 _022E5710:
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	ldmeqia sp!, {r4, pc}
 	mov r0, r4
@@ -2838,7 +2838,7 @@ ov29_022E5A00: ; 0x022E5A00
 	sub sp, sp, #0x18
 	mov r5, r0
 	mov r4, r1
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _022E5AD4
 	ldrb r0, [r4]
@@ -2907,7 +2907,7 @@ ov29_022E5AE4: ; 0x022E5AE4
 	sub sp, sp, #0x18
 	mov r5, r0
 	mov r4, r1
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _022E5BC8
 	ldrb r0, [r4]
@@ -3201,8 +3201,8 @@ _022E5EC4:
 	ldmia sp!, {r4, r5, r6, pc}
 	arm_func_end ov29_022E5E84
 
-	arm_func_start ov29_022E5ED0
-ov29_022E5ED0: ; 0x022E5ED0
+	arm_func_start ShouldDisplayEntityAdvanced
+ShouldDisplayEntityAdvanced: ; 0x022E5ED0
 	stmdb sp!, {r3, lr}
 	ldrb r1, [r0, #0x20]
 	cmp r1, #0
@@ -3232,7 +3232,7 @@ _022E5F14:
 	ldmia sp!, {r3, pc}
 	.align 2, 0
 _022E5F1C: .word DUNGEON_PTR
-	arm_func_end ov29_022E5ED0
+	arm_func_end ShouldDisplayEntityAdvanced
 
 	arm_func_start ov29_022E5F20
 ov29_022E5F20: ; 0x022E5F20
@@ -3952,7 +3952,7 @@ ov29_022E67E4: ; 0x022E67E4
 	mov r0, r6
 	mov r4, r2
 	mov r5, #0x200
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _022E68AC
 	mov r0, r7
diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s
index df04677c..7927c69e 100644
--- a/asm/overlay_29_0232145C.s
+++ b/asm/overlay_29_0232145C.s
@@ -4380,7 +4380,7 @@ ov29_02324E78: ; 0x02324E78
 	bl GetMoveAnimation
 	ldrsh r5, [r0]
 	mov r0, r7
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	moveq r0, sl
 	beq _023250C8
@@ -4626,7 +4626,7 @@ _02325228:
 	ldr r1, [r5, #0x10]
 	mov r1, r1, asr #8
 	strh r1, [sp, #0xa]
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _02325600
 	mov r0, sl
@@ -4696,7 +4696,7 @@ _02325354:
 	cmp r4, #0x63
 	bne _023253C8
 	mov r0, r5
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _02325600
 	mov r3, r8
@@ -4727,7 +4727,7 @@ _023253C8:
 	cmp r4, #0x62
 	bne _0232543C
 	mov r0, r5
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _02325600
 	add r0, sp, #4
diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s
index 0f67bf2b..e476c797 100644
--- a/asm/overlay_29_02325644.s
+++ b/asm/overlay_29_02325644.s
@@ -64,7 +64,7 @@ PlayMoveAnimation: ; 0x023256B4
 	beq _02325730
 	mov r0, sb
 	ldr r6, [sb, #0xb4]
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	bne _02325740
 	b _023258E0
@@ -225,11 +225,11 @@ _02325958:
 	mov r0, r5
 	ldr r8, [r5, #0xb4]
 	ldr sb, [r4, #0xb4]
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _02325B04
 	mov r0, r4
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _02325B04
 	mov r0, r5
diff --git a/asm/overlay_29_02328030.s b/asm/overlay_29_02328030.s
index 0f95475f..bd496170 100644
--- a/asm/overlay_29_02328030.s
+++ b/asm/overlay_29_02328030.s
@@ -1504,7 +1504,7 @@ DoMoveSeismicToss: ; 0x02329258
 	mov sl, r3
 	ldr r7, [r5, #0xb4]
 	ldrb sb, [r1, #0xa]
-	bl ov29_022E5ED0
+	bl ShouldDisplayEntityAdvanced
 	cmp r0, #0
 	beq _02329350
 	ldrb r2, [r7, #0x4c]
diff --git a/asm/overlay_31.s b/asm/overlay_31.s
index 508bb720..46db6276 100644
--- a/asm/overlay_31.s
+++ b/asm/overlay_31.s
@@ -457,7 +457,7 @@ ov31_02382E18: ; 0x02382E18
 	mov r0, #0x62
 	bl AdvanceFrame
 	mov r0, r4
-	bl ov31_02382ED4
+	bl CreateStairsMenuState
 	mov r5, #0
 	mov r6, #1
 	mov r7, #0x62
@@ -501,8 +501,8 @@ _02382EC4:
 _02382ED0: .word ov31_0238A2A0
 	arm_func_end ov31_02382E18
 
-	arm_func_start ov31_02382ED4
-ov31_02382ED4: ; 0x02382ED4
+	arm_func_start CreateStairsMenuState
+CreateStairsMenuState: ; 0x02382ED4
 	stmdb sp!, {r3, r4, r5, lr}
 	mov r5, r0
 	ldr r0, _02382F60 ; =OVERLAY31_UNKNOWN_STRUCT__NA_2389E30
@@ -542,10 +542,10 @@ _02382F50:
 	.align 2, 0
 _02382F60: .word OVERLAY31_UNKNOWN_STRUCT__NA_2389E30
 _02382F64: .word ov31_0238A2A0
-	arm_func_end ov31_02382ED4
+	arm_func_end CreateStairsMenuState
 
-	arm_func_start ov31_02382F68
-ov31_02382F68: ; 0x02382F68
+	arm_func_start StairsSubheadingCallback
+StairsSubheadingCallback: ; 0x02382F68
 	stmdb sp!, {r4, lr}
 	ldr r1, _02382FB4 ; =ov31_0238A2A0
 	ldr r2, _02382FB8 ; =ov31_02389E22
@@ -568,10 +568,10 @@ ov31_02382F68: ; 0x02382F68
 	.align 2, 0
 _02382FB4: .word ov31_0238A2A0
 _02382FB8: .word ov31_02389E22
-	arm_func_end ov31_02382F68
+	arm_func_end StairsSubheadingCallback
 
-	arm_func_start ov31_02382FBC
-ov31_02382FBC: ; 0x02382FBC
+	arm_func_start HandleStairsMenu
+HandleStairsMenu: ; 0x02382FBC
 	stmdb sp!, {r4, lr}
 	sub sp, sp, #0x138
 	ldr r0, _02383218 ; =ov31_0238A2A0
@@ -610,7 +610,7 @@ _02382FF4:
 	ldr r1, _02383230 ; =0x80000813
 	strh r3, [sp, #0xa8]
 	str r4, [sp]
-	ldr r3, _02383234 ; =ov31_02382F68
+	ldr r3, _02383234 ; =StairsSubheadingCallback
 	add r2, sp, #0xa0
 	str r4, [sp, #4]
 	bl CreateAdvancedTextBox
@@ -742,12 +742,12 @@ _02383224: .word 0x00400013
 _02383228: .word ov31_02389E22
 _0238322C: .word DUNGEON_WINDOW_PARAMS_6
 _02383230: .word 0x80000813
-_02383234: .word ov31_02382F68
+_02383234: .word StairsSubheadingCallback
 _02383238: .word ov29_0237C91C
 _0238323C: .word DUNGEON_WINDOW_PARAMS_5
 _02383240: .word 0x00001812
 _02383244: .word ov31_02383248
-	arm_func_end ov31_02382FBC
+	arm_func_end HandleStairsMenu
 
 	arm_func_start ov31_02383248
 ov31_02383248: ; 0x02383248
@@ -9510,7 +9510,7 @@ OVERLAY31_UNKNOWN_STRUCT__NA_2389E30:
 	.byte 0x0E, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00
 	.word ov31_023832F0
-	.word ov31_02382FBC
+	.word HandleStairsMenu
 	.global DUNGEON_WINDOW_PARAMS_5
 DUNGEON_WINDOW_PARAMS_5:
 	.byte 0x00, 0x00, 0x00, 0x00