label functions

3 files changed, 219 insertions, 219 deletions

diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index 0f75f46..e84f79a 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -286831,7 +286831,7 @@ _080987C0:
 	bl sub_809977C
 	bl sub_809D4B0
 	adds r0, r4, 0
-	bl sub_80A6390
+	bl GroundSprite_Reset
 	bl sub_809C63C
 	bl sub_809A62C
 	bl sub_80A4AEC
@@ -286847,7 +286847,7 @@ _080987C0:
 	beq _08098848
 	adds r0, r7, 0
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 	b _08098850
 	.align 2, 0
 _0809882C: .4byte gUnknown_20398BE
@@ -286860,9 +286860,9 @@ _08098844: .4byte gUnknown_20398BC
 _08098848:
 	movs r0, 0x66
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 _08098850:
-	bl sub_80A59C0
+	bl GroundMap_Action
 	movs r0, 0
 	movs r1, 0
 	bl sub_8005838
@@ -286928,17 +286928,17 @@ _080988B2:
 _080988E4:
 	movs r0, 0x72
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 	movs r0, 0x1E
 	bl sub_8098F44
 	movs r0, 0x1E
 	bl sub_80118C4
 _080988F8:
-	bl sub_80A59C0
+	bl GroundMap_Action
 	bl nullsub_124
-	bl sub_80AB254
-	bl sub_80ACA3C
-	bl sub_80AD714
+	bl GroundLives_Action
+	bl GroundObject_Action
+	bl GroundEffect_Action
 	bl nullsub_105
 	bl sub_809B474
 	bl sub_80A2380
@@ -287257,11 +287257,11 @@ sub_8098BDC:
 	bl sub_8009908
 	bl xxx_call_update_bg_sound_input
 	bl sub_80A6E68
-	bl sub_80A59C0
+	bl GroundMap_Action
 	bl nullsub_124
-	bl sub_80AB254
-	bl sub_80ACA3C
-	bl sub_80AD714
+	bl GroundLives_Action
+	bl GroundObject_Action
+	bl GroundEffect_Action
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -288353,7 +288353,7 @@ _080994B0:
 	bl sub_80A4AEC
 	bl sub_809D0BC
 	mov r0, r10
-	bl sub_80A4DCC
+	bl GroundMap_Select
 	mov r0, sp
 	mov r1, r8
 	bl sub_80A579C
@@ -293592,7 +293592,7 @@ _0809BD84:
 	bl sub_80018D8
 	movs r0, 0x46
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 _0809BDB2:
 	cmp r4, 0x3
 	bne _0809BDCC
@@ -294484,7 +294484,7 @@ _0809C4DE:
 	beq _0809C4F4
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 _0809C4F4:
 	pop {r4,r5}
 	pop {r0}
@@ -295855,7 +295855,7 @@ _0809CF3C:
 	str r0, [r4]
 	movs r0, 0x45
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 _0809CF46:
 	str r5, [r6]
 	movs r1, 0x1
@@ -297095,8 +297095,8 @@ sub_809D770:
 	bx r1
 	thumb_func_end sub_809D770
 
-	thumb_func_start sub_809D790
-sub_809D790:
+	thumb_func_start GroundScript_ExecutePP
+GroundScript_ExecutePP:
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	adds r7, r1, 0
@@ -297247,7 +297247,7 @@ _0809D8B8:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809D790
+	thumb_func_end GroundScript_ExecutePP
 
 	thumb_func_start sub_809D8C0
 sub_809D8C0:
@@ -297264,7 +297264,7 @@ sub_809D8C0:
 	adds r1, r5, 0
 	mov r2, sp
 	adds r3, r6, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	lsls r0, 24
 	lsrs r0, 24
 	add sp, 0xC
@@ -298703,7 +298703,7 @@ _0809E5DA:
 	bl sub_80999FC
 	movs r0, 0x70
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 	movs r1, 0x8
 	ldrsh r0, [r7, r1]
 	cmp r0, 0
@@ -299947,7 +299947,7 @@ _0809F16A:
 	ldr r4, _0809F1E8
 	movs r1, 0
 	ldrsh r0, [r4, r1]
-	bl sub_80A6390
+	bl GroundSprite_Reset
 	bl sub_809D0BC
 	bl sub_80AD9D0
 	bl sub_80A786C
@@ -299964,15 +299964,15 @@ _0809F16A:
 	bl sub_809C770
 	movs r5, 0
 	ldrsh r0, [r4, r5]
-	bl sub_80A4DCC
+	bl GroundMap_Select
 	movs r1, 0
 	ldrsh r0, [r4, r1]
-	bl sub_80AD880
+	bl GroundLink_Select
 	movs r2, 0
 	ldrsh r0, [r4, r2]
 	movs r1, 0
 	movs r2, 0
-	bl sub_80A791C
+	bl GroundLives_Select
 	movs r3, 0
 	ldrsh r0, [r4, r3]
 	b _0809F2A0
@@ -300018,7 +300018,7 @@ _0809F1FC:
 _0809F242:
 	movs r1, 0
 	ldrsh r0, [r5, r1]
-	bl sub_80A6390
+	bl GroundSprite_Reset
 	bl sub_809D0BC
 	bl sub_80AD9D0
 	bl sub_80A786C
@@ -300043,21 +300043,21 @@ _0809F242:
 	add r1, sp, 0x58
 	add r2, sp, 0x8
 	ldrb r2, [r2, 0x1]
-	bl sub_80A50C8
+	bl GroundMap_SelectDungeon
 	movs r3, 0
 	ldrsh r0, [r5, r3]
-	bl sub_80AD880
+	bl GroundLink_Select
 	movs r4, 0
 	ldrsh r0, [r5, r4]
 	movs r1, 0
 	movs r2, 0
-	bl sub_80A791C
+	bl GroundLives_Select
 	movs r1, 0
 	ldrsh r0, [r5, r1]
 _0809F2A0:
 	movs r1, 0
 	movs r2, 0
-	bl sub_80ABBF0
+	bl GroundObject_Select
 	b _0809EAE0
 	.align 2, 0
 _0809F2AC: .4byte gUnknown_2039A34
@@ -300071,7 +300071,7 @@ _0809F2C8:
 	ldr r0, [sp, 0xC]
 	lsls r0, 16
 	asrs r0, 16
-	bl sub_80A5F50
+	bl GroundWeather_Select
 	bl _0809EAE0
 _0809F2D6:
 	add r0, sp, 0x8
@@ -300136,17 +300136,17 @@ _0809F350:
 	ldrsh r0, [r4, r1]
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80A791C
+	bl GroundLives_Select
 	movs r2, 0
 	ldrsh r0, [r4, r2]
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80ABBF0
+	bl GroundObject_Select
 	movs r3, 0
 	ldrsh r0, [r4, r3]
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80ACC2C
+	bl GroundEffect_Select
 	movs r1, 0
 	ldrsh r0, [r4, r1]
 	b _0809F3CE
@@ -300158,7 +300158,7 @@ _0809F380:
 	ldrsh r0, [r0, r2]
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80A791C
+	bl GroundLives_Select
 	bl _0809EAE0
 	.align 2, 0
 _0809F394: .4byte gUnknown_2039A32
@@ -300168,7 +300168,7 @@ _0809F398:
 	ldrsh r0, [r0, r3]
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80ABBF0
+	bl GroundObject_Select
 	bl _0809EAE0
 	.align 2, 0
 _0809F3AC: .4byte gUnknown_2039A32
@@ -300178,7 +300178,7 @@ _0809F3B0:
 	ldrsh r0, [r0, r4]
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80ACC2C
+	bl GroundEffect_Select
 	bl _0809EAE0
 	.align 2, 0
 _0809F3C4: .4byte gUnknown_2039A32
@@ -300189,7 +300189,7 @@ _0809F3C8:
 _0809F3CE:
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80ADA24
+	bl GroundEvent_Select
 	bl _0809EAE0
 	.align 2, 0
 _0809F3DC: .4byte gUnknown_2039A32
@@ -300222,7 +300222,7 @@ _0809F412:
 _0809F41E:
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl sub_80ADA90
+	bl GroundEvent_Cancel
 	bl _0809EAE0
 _0809F42A:
 	bl sub_80A79FC
@@ -300307,7 +300307,7 @@ _0809F4C8:
 _0809F4CE:
 	movs r0, 0x1
 	negs r0, r0
-	bl sub_80ABD88
+	bl GroundObject_Add
 	lsls r0, 16
 	asrs r5, r0, 16
 	cmp r5, 0
@@ -300393,7 +300393,7 @@ _0809F578:
 _0809F57E:
 	movs r0, 0x1
 	negs r0, r0
-	bl sub_80ACDC4
+	bl GroundEffect_Add
 	lsls r0, 16
 	asrs r5, r0, 16
 	cmp r5, 0
@@ -300416,7 +300416,7 @@ _0809F5AE:
 	movs r1, 0x2
 	ldrsh r0, [r0, r1]
 	movs r1, 0x1
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 	bl _0809EAE0
 _0809F5BE:
 	add r0, sp, 0x8
@@ -300483,7 +300483,7 @@ _0809F62A:
 	adds r0, r4, 0
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl sub_80A4C50
+	bl GroundMap_ExecuteStation
 	ldr r1, _0809F65C
 	movs r5, 0
 	ldrsh r0, [r1, r5]
@@ -300590,7 +300590,7 @@ _0809F70C:
 	ldrsh r0, [r0, r3]
 _0809F712:
 	movs r1, 0
-	bl sub_80A4BFC
+	bl GroundMap_ExecuteEvent
 	bl _0809EAE0
 _0809F71C:
 	add r4, sp, 0x1C
@@ -300605,7 +300605,7 @@ _0809F71C:
 	ldrsh r0, [r1, r2]
 	adds r1, 0x8
 	adds r2, r4, 0
-	bl sub_80A88D8
+	bl GroundLives_ExecuteScript
 	bl _0809EAE0
 _0809F73E:
 	add r4, sp, 0x28
@@ -300621,7 +300621,7 @@ _0809F73E:
 	mov r1, r9
 	adds r1, 0x8
 	adds r2, r4, 0
-	bl sub_80AC2BC
+	bl GroundObject_ExecuteScript
 	bl _0809EAE0
 _0809F762:
 	add r4, sp, 0x34
@@ -300637,7 +300637,7 @@ _0809F762:
 	mov r1, r9
 	adds r1, 0x8
 	adds r2, r4, 0
-	bl sub_80AD1D4
+	bl GroundEffect_ExecuteScript
 	bl _0809EAE0
 _0809F786:
 	ldr r0, [sp, 0xC]
@@ -300710,7 +300710,7 @@ _0809F818:
 	movs r5, 0xA
 	ldrsh r0, [r4, r5]
 	mov r1, r8
-	bl sub_80A89D0
+	bl GroundLives_ExecutePlayerScriptActionLives
 	movs r0, 0x3
 	bl _080A142E
 	.align 2, 0
@@ -303462,7 +303462,7 @@ _080A0ECC:
 	ldrb r2, [r0, 0x1]
 	adds r0, r5, 0
 _080A0EF2:
-	bl sub_8002260
+	bl FlagCalc
 	adds r1, r0, 0
 	b _080A1098
 _080A0EFA:
@@ -304071,7 +304071,7 @@ _080A13B0:
 	add r0, sp, 0x1C
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80A4B70
+	bl GroundMap_GetStationScript
 	ldr r0, [sp, 0x1C]
 	mov r1, r10
 	str r0, [r1, 0x4]
@@ -304094,7 +304094,7 @@ _080A13CA:
 	bl sub_809D940
 	movs r3, 0
 	ldrsh r0, [r4, r3]
-	bl sub_80A4CC4
+	bl GroundMap_ExecuteEnter
 	bl _0809EAE0
 	.align 2, 0
 _080A13F4: .4byte gUnknown_2039A34
@@ -304157,8 +304157,8 @@ sub_80A1440:
 	bx r1
 	thumb_func_end sub_80A1440
 
-	thumb_func_start sub_80A145C
-sub_80A145C:
+	thumb_func_start GroundScript_ExecuteTrigger
+GroundScript_ExecuteTrigger:
 	push {r4,r5,lr}
 	sub sp, 0xF4
 	lsls r0, 16
@@ -304188,7 +304188,7 @@ sub_80A145C:
 	adds r0, r5, 0
 	movs r1, 0
 	add r2, sp, 0x4
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	add r1, sp, 0x44
 	add r0, sp, 0x38
 	ldm r0!, {r2-r4}
@@ -304222,7 +304222,7 @@ _080A14DE:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80A145C
+	thumb_func_end GroundScript_ExecuteTrigger
 
 	thumb_func_start sub_80A14E8
 sub_80A14E8:
@@ -305629,7 +305629,7 @@ _080A20F4:
 	asrs r2, 16
 	lsls r3, r7, 24
 	asrs r3, 24
-	bl sub_80ACDC4
+	bl GroundEffect_Add
 	lsls r0, 16
 	asrs r0, 16
 	cmp r0, 0
@@ -305895,7 +305895,7 @@ _080A233A:
 	lsls r1, r5, 16
 	lsrs r1, 16
 	movs r0, 0
-	bl sub_80A6A90
+	bl GroundSprite_ExtendPaletteAdd
 	b _080A236A
 _080A2346:
 	movs r0, 0
@@ -307878,7 +307878,7 @@ _080A3198:
 	add r2, r8
 	str r5, [sp]
 	adds r3, r4, 0
-	bl sub_80A382C
+	bl _UncompressCell
 	ldr r0, _080A32AC
 	add r0, r9
 	movs r3, 0x89
@@ -308674,8 +308674,8 @@ _080A3820:
 _080A3828: .4byte 0x0000ffff
 	thumb_func_end sub_80A37C4
 
-	thumb_func_start sub_80A382C
-sub_80A382C:
+	thumb_func_start _UncompressCell
+_UncompressCell:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -308795,7 +308795,7 @@ _080A38FE:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80A382C
+	thumb_func_end _UncompressCell
 
 	thumb_func_start sub_80A3908
 sub_80A3908:
@@ -311362,8 +311362,8 @@ _080A4B62:
 _080A4B6C: .4byte gUnknown_3001B70
 	thumb_func_end sub_80A4B54
 
-	thumb_func_start sub_80A4B70
-sub_80A4B70:
+	thumb_func_start GroundMap_GetStationScript
+GroundMap_GetStationScript:
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -311419,7 +311419,7 @@ sub_80A4B70:
 	.align 2, 0
 _080A4BE0: .4byte gUnknown_8117560
 _080A4BE4: .4byte gUnknown_811756C
-	thumb_func_end sub_80A4B70
+	thumb_func_end GroundMap_GetStationScript
 
 	thumb_func_start sub_80A4BE8
 sub_80A4BE8:
@@ -311428,13 +311428,13 @@ sub_80A4BE8:
 	asrs r1, 16
 	movs r2, 0
 	movs r3, 0
-	bl sub_80A4B70
+	bl GroundMap_GetStationScript
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80A4BE8
 
-	thumb_func_start sub_80A4BFC
-sub_80A4BFC:
+	thumb_func_start GroundMap_ExecuteEvent
+GroundMap_ExecuteEvent:
 	push {r4,r5,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -311463,7 +311463,7 @@ _080A4C2C:
 	ldr r3, _080A4C4C
 	movs r1, 0
 	mov r2, sp
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -311472,10 +311472,10 @@ _080A4C2C:
 _080A4C44: .4byte gUnknown_8117594
 _080A4C48: .4byte gUnknown_3001B6C
 _080A4C4C: .4byte gUnknown_81175E0
-	thumb_func_end sub_80A4BFC
+	thumb_func_end GroundMap_ExecuteEvent
 
-	thumb_func_start sub_80A4C50
-sub_80A4C50:
+	thumb_func_start GroundMap_ExecuteStation
+GroundMap_ExecuteStation:
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -311505,7 +311505,7 @@ sub_80A4C50:
 	adds r1, r4, 0
 	adds r2, r5, 0
 	adds r3, r6, 0
-	bl sub_80A4B70
+	bl GroundMap_GetStationScript
 	mov r0, r8
 	cmp r0, 0
 	beq _080A4C9C
@@ -311518,7 +311518,7 @@ _080A4C9C:
 	ldr r3, _080A4CC0
 	movs r1, 0
 	add r2, sp, 0x8
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	add sp, 0x14
 	pop {r3}
 	mov r8, r3
@@ -311529,10 +311529,10 @@ _080A4C9C:
 _080A4CB8: .4byte gUnknown_81175EC
 _080A4CBC: .4byte gUnknown_3001B6C
 _080A4CC0: .4byte gUnknown_8117644
-	thumb_func_end sub_80A4C50
+	thumb_func_end GroundMap_ExecuteStation
 
-	thumb_func_start sub_80A4CC4
-sub_80A4CC4:
+	thumb_func_start GroundMap_ExecuteEnter
+GroundMap_ExecuteEnter:
 	push {r4,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -311558,7 +311558,7 @@ sub_80A4CC4:
 	ldr r3, _080A4D10
 	movs r1, 0
 	mov r2, sp
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -311567,7 +311567,7 @@ sub_80A4CC4:
 _080A4D08: .4byte gUnknown_8117650
 _080A4D0C: .4byte gUnknown_3001B6C
 _080A4D10: .4byte gUnknown_8117698
-	thumb_func_end sub_80A4CC4
+	thumb_func_end GroundMap_ExecuteEnter
 
 	thumb_func_start sub_80A4D14
 sub_80A4D14:
@@ -311677,8 +311677,8 @@ _080A4DC4:
 	bx r1
 	thumb_func_end sub_80A4D7C
 
-	thumb_func_start sub_80A4DCC
-sub_80A4DCC:
+	thumb_func_start GroundMap_Select
+GroundMap_Select:
 	push {r4-r6,lr}
 	lsls r0, 16
 	asrs r5, r0, 16
@@ -311808,7 +311808,7 @@ _080A4EF2:
 	adds r1, r4, 0x4
 	ldr r2, [r4, 0x8]
 	adds r0, r5, 0
-	bl sub_80A50C8
+	bl GroundMap_SelectDungeon
 	b _080A50BA
 _080A4F08:
 	ldr r0, _080A4F18
@@ -312017,7 +312017,7 @@ _080A50A2:
 	cmp r1, r0
 	beq _080A50B4
 	adds r0, r1, 0
-	bl sub_80A5F50
+	bl GroundWeather_Select
 _080A50B4:
 	ldr r0, _080A50C4
 	bl sub_80A56D8
@@ -312028,10 +312028,10 @@ _080A50BA:
 	.align 2, 0
 _080A50C0: .4byte gUnknown_3001B70
 _080A50C4: .4byte gUnknown_81176F8
-	thumb_func_end sub_80A4DCC
+	thumb_func_end GroundMap_Select
 
-	thumb_func_start sub_80A50C8
-sub_80A50C8:
+	thumb_func_start GroundMap_SelectDungeon
+GroundMap_SelectDungeon:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -312172,7 +312172,7 @@ _080A51EC:
 	.align 2, 0
 _080A51FC: .4byte gUnknown_8117354
 _080A5200: .4byte gUnknown_8117754
-	thumb_func_end sub_80A50C8
+	thumb_func_end GroundMap_SelectDungeon
 
 	thumb_func_start sub_80A5204
 sub_80A5204:
@@ -313294,8 +313294,8 @@ sub_80A59A0:
 _080A59BC: .4byte gUnknown_3001B70
 	thumb_func_end sub_80A59A0
 
-	thumb_func_start sub_80A59C0
-sub_80A59C0:
+	thumb_func_start GroundMap_Action
+GroundMap_Action:
 	push {lr}
 	bl nullsub_123
 	ldr r0, _080A59D4
@@ -313307,7 +313307,7 @@ sub_80A59C0:
 	.align 2, 0
 _080A59D4: .4byte gUnknown_3001B6C
 _080A59D8: .4byte gUnknown_8117770
-	thumb_func_end sub_80A59C0
+	thumb_func_end GroundMap_Action
 
 	thumb_func_start sub_80A59DC
 sub_80A59DC:
@@ -314034,8 +314034,8 @@ nullsub_122:
 	bx lr
 	thumb_func_end nullsub_122
 
-	thumb_func_start sub_80A5F50
-sub_80A5F50:
+	thumb_func_start GroundWeather_Select
+GroundWeather_Select:
 	push {r4-r7,lr}
 	lsls r0, 16
 	asrs r5, r0, 16
@@ -314194,7 +314194,7 @@ _080A60B4:
 	.align 2, 0
 _080A60BC: .4byte gUnknown_3001B78
 _080A60C0: .4byte gUnknown_2026E4E
-	thumb_func_end sub_80A5F50
+	thumb_func_end GroundWeather_Select
 
 	thumb_func_start sub_80A60C4
 sub_80A60C4:
@@ -314531,7 +314531,7 @@ _080A6350:
 	ble _080A6350
 	movs r0, 0x1
 	negs r0, r0
-	bl sub_80A6390
+	bl GroundSprite_Reset
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -314544,8 +314544,8 @@ _080A6388: .4byte gUnknown_2039DD4
 _080A638C: .4byte gUnknown_2039DD0
 	thumb_func_end sub_80A62F0
 
-	thumb_func_start sub_80A6390
-sub_80A6390:
+	thumb_func_start GroundSprite_Reset
+GroundSprite_Reset:
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -314638,7 +314638,7 @@ _080A6444:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80A6390
+	thumb_func_end GroundSprite_Reset
 
 	thumb_func_start sub_80A6460
 sub_80A6460:
@@ -315368,7 +315368,7 @@ _080A6986:
 	mov r0, r12
 	str r0, [r4, 0x8]
 	ldrh r1, [r1, 0x2]
-	bl sub_80A6A90
+	bl GroundSprite_ExtendPaletteAdd
 	cmp r5, 0x1
 	ble _080A69B2
 	movs r2, 0x2
@@ -315497,8 +315497,8 @@ _080A6A88: .4byte 0x0000ffff
 _080A6A8C: .4byte gUnknown_2039DD0
 	thumb_func_end sub_80A69FC
 
-	thumb_func_start sub_80A6A90
-sub_80A6A90:
+	thumb_func_start GroundSprite_ExtendPaletteAdd
+GroundSprite_ExtendPaletteAdd:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -315752,7 +315752,7 @@ _080A6C78:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80A6A90
+	thumb_func_end GroundSprite_ExtendPaletteAdd
 
 	thumb_func_start sub_80A6C88
 sub_80A6C88:
@@ -317458,8 +317458,8 @@ _080A7914: .4byte gUnknown_3001B84
 _080A7918: .4byte gUnknown_3001B80
 	thumb_func_end sub_80A78F0
 
-	thumb_func_start sub_80A791C
-sub_80A791C:
+	thumb_func_start GroundLives_Select
+GroundLives_Select:
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -317498,7 +317498,7 @@ _080A7960:
 	adds r1, r5, 0
 	adds r2, r7, 0
 	adds r3, r6, 0
-	bl sub_80A80A4
+	bl GroundLives_Add
 	subs r4, 0x1
 	adds r5, 0x18
 	cmp r4, 0
@@ -317511,7 +317511,7 @@ _080A7976:
 	.align 2, 0
 _080A7980: .4byte gUnknown_811808C
 _080A7984: .4byte gUnknown_8118098
-	thumb_func_end sub_80A791C
+	thumb_func_end GroundLives_Select
 
 	thumb_func_start sub_80A7988
 sub_80A7988:
@@ -318447,8 +318447,8 @@ _080A8098:
 	bx r1
 	thumb_func_end sub_80A7DDC
 
-	thumb_func_start sub_80A80A4
-sub_80A80A4:
+	thumb_func_start GroundLives_Add
+GroundLives_Add:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -319035,7 +319035,7 @@ _080A8508:
 	ldr r3, _080A854C
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	mov r2, r10
 	strh r2, [r7]
 	mov r0, r9
@@ -319121,7 +319121,7 @@ _080A859C:
 	ldr r3, _080A8628
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	movs r1, 0xB0
 	lsls r1, 1
 	adds r0, r5, r1
@@ -319198,7 +319198,7 @@ _080A8674:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80A80A4
+	thumb_func_end GroundLives_Add
 
 	thumb_func_start sub_80A8684
 sub_80A8684:
@@ -319525,8 +319525,8 @@ _080A88D4:
 	bx r1
 	thumb_func_end sub_80A88A0
 
-	thumb_func_start sub_80A88D8
-sub_80A88D8:
+	thumb_func_start GroundLives_ExecuteScript
+GroundLives_ExecuteScript:
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -319564,7 +319564,7 @@ _080A891C:
 	ldr r3, _080A893C
 	adds r1, r7, 0
 	adds r2, r6, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	movs r0, 0xAE
 	lsls r0, 1
 	adds r1, r5, r0
@@ -319577,10 +319577,10 @@ _080A8934:
 	bx r1
 	.align 2, 0
 _080A893C: .4byte gUnknown_81181F4
-	thumb_func_end sub_80A88D8
+	thumb_func_end GroundLives_ExecuteScript
 
-	thumb_func_start sub_80A8940
-sub_80A8940:
+	thumb_func_start _ExecutePlayerScript
+_ExecutePlayerScript:
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -319628,7 +319628,7 @@ _080A8990:
 	ldr r3, _080A89A8
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	lsls r0, 24
 	lsrs r0, 24
 _080A89A2:
@@ -319637,7 +319637,7 @@ _080A89A2:
 	bx r1
 	.align 2, 0
 _080A89A8: .4byte gUnknown_8118218
-	thumb_func_end sub_80A8940
+	thumb_func_end _ExecutePlayerScript
 
 	thumb_func_start sub_80A89AC
 sub_80A89AC:
@@ -319650,7 +319650,7 @@ sub_80A89AC:
 	lsls r3, 4
 	ldr r0, [r4]
 	adds r0, r3
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4}
@@ -319660,8 +319660,8 @@ sub_80A89AC:
 _080A89CC: .4byte gUnknown_3001B84
 	thumb_func_end sub_80A89AC
 
-	thumb_func_start sub_80A89D0
-sub_80A89D0:
+	thumb_func_start GroundLives_ExecutePlayerScriptActionLives
+GroundLives_ExecutePlayerScriptActionLives:
 	push {r4-r6,lr}
 	sub sp, 0x10
 	lsls r0, 16
@@ -319714,7 +319714,7 @@ sub_80A89D0:
 	add r1, sp, 0xC
 	adds r0, r5, 0
 	mov r2, sp
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	lsls r0, 24
 	lsrs r0, 24
 	b _080A8A52
@@ -319728,7 +319728,7 @@ _080A8A52:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80A89D0
+	thumb_func_end GroundLives_ExecutePlayerScriptActionLives
 
 	thumb_func_start sub_80A8A5C
 sub_80A8A5C:
@@ -319768,11 +319768,11 @@ sub_80A8A5C:
 	adds r1, 0x40
 	adds r0, r5, 0
 	adds r2, r4, 0
-	bl sub_80AC2BC
+	bl GroundObject_ExecuteScript
 	add r1, sp, 0x18
 	adds r0, r6, 0
 	mov r2, sp
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	lsls r0, 24
 	lsrs r0, 24
 	b _080A8AC2
@@ -319814,7 +319814,7 @@ sub_80A8ACC:
 	adds r0, r4, 0
 	movs r1, 0
 	mov r2, sp
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	lsls r0, 24
 	lsrs r0, 24
 	b _080A8B12
@@ -321439,7 +321439,7 @@ _080A96A8:
 	movs r3, 0
 	ldrsh r0, [r5, r3]
 	mov r1, r9
-	bl sub_80A89D0
+	bl GroundLives_ExecutePlayerScriptActionLives
 _080A96B2:
 	lsls r0, 24
 	cmp r0, 0
@@ -322729,7 +322729,7 @@ _080AA384:
 	movs r1, 0
 	ldrsh r0, [r7, r1]
 	adds r1, r5, 0
-	bl sub_80A89D0
+	bl GroundLives_ExecutePlayerScriptActionLives
 	lsls r0, 24
 	cmp r0, 0
 	bne _080AA3BE
@@ -324126,7 +324126,7 @@ _080AAE06:
 	adds r0, r5, 0
 	movs r1, 0
 	mov r2, sp
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	b _080AAEC0
 _080AAE32:
 	add r6, sp, 0xC
@@ -324151,11 +324151,11 @@ _080AAE32:
 	adds r1, r5, 0
 	adds r1, 0x40
 	adds r2, r4, 0
-	bl sub_80A88D8
+	bl GroundLives_ExecuteScript
 	adds r0, r5, 0
 	movs r1, 0
 	movs r2, 0
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	movs r3, 0
 	ldrsh r0, [r6, r3]
 	bl sub_80A8E9C
@@ -324185,7 +324185,7 @@ _080AAE9C:
 	adds r0, r5, 0
 	movs r1, 0
 	adds r2, r4, 0
-	bl sub_80A8940
+	bl _ExecutePlayerScript
 	b _080AAEC0
 	.align 2, 0
 _080AAEB4: .4byte 0x00000195
@@ -324733,8 +324733,8 @@ sub_80AB248:
 	bx r1
 	thumb_func_end sub_80AB248
 
-	thumb_func_start sub_80AB254
-sub_80AB254:
+	thumb_func_start GroundLives_Action
+GroundLives_Action:
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -325166,7 +325166,7 @@ _080AB594:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80AB254
+	thumb_func_end GroundLives_Action
 
 	thumb_func_start sub_80AB5A4
 sub_80AB5A4:
@@ -325992,7 +325992,7 @@ _080ABBA8:
 	cmp r0, r6
 	beq _080ABBB6
 	adds r0, r1, 0
-	bl sub_80AC168
+	bl GroundObject_Delete
 _080ABBB6:
 	adds r0, r5, 0
 	movs r1, 0x80
@@ -326027,8 +326027,8 @@ sub_80ABBD4:
 _080ABBEC: .4byte gUnknown_3001B88
 	thumb_func_end sub_80ABBD4
 
-	thumb_func_start sub_80ABBF0
-sub_80ABBF0:
+	thumb_func_start GroundObject_Select
+GroundObject_Select:
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -326067,7 +326067,7 @@ _080ABC34:
 	adds r1, r5, 0
 	adds r2, r7, 0
 	adds r3, r6, 0
-	bl sub_80ABD88
+	bl GroundObject_Add
 	subs r4, 0x1
 	adds r5, 0x18
 	cmp r4, 0
@@ -326080,7 +326080,7 @@ _080ABC4A:
 	.align 2, 0
 _080ABC54: .4byte gUnknown_81183E4
 _080ABC58: .4byte gUnknown_81183F0
-	thumb_func_end sub_80ABBF0
+	thumb_func_end GroundObject_Select
 
 	thumb_func_start sub_80ABC5C
 sub_80ABC5C:
@@ -326120,7 +326120,7 @@ _080ABC84:
 	bne _080ABCA6
 _080ABCA0:
 	adds r0, r1, 0
-	bl sub_80AC168
+	bl GroundObject_Delete
 _080ABCA6:
 	adds r0, r6, 0
 	movs r1, 0x80
@@ -326183,7 +326183,7 @@ _080ABCF0:
 	cmp r0, 0
 	bne _080ABD20
 	adds r0, r6, 0
-	bl sub_80AC168
+	bl GroundObject_Delete
 _080ABD20:
 	adds r0, r6, 0x1
 	lsls r0, 16
@@ -326242,8 +326242,8 @@ _080ABD80:
 	bx r1
 	thumb_func_end sub_80ABD48
 
-	thumb_func_start sub_80ABD88
-sub_80ABD88:
+	thumb_func_start GroundObject_Add
+GroundObject_Add:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -326737,10 +326737,10 @@ _080AC158: .4byte gUnknown_81182F4
 _080AC15C: .4byte gUnknown_8118350
 _080AC160: .4byte gUnknown_812F1F8
 _080AC164: .4byte gUnknown_81184A4
-	thumb_func_end sub_80ABD88
+	thumb_func_end GroundObject_Add
 
-	thumb_func_start sub_80AC168
-sub_80AC168:
+	thumb_func_start GroundObject_Delete
+GroundObject_Delete:
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r2, 16
@@ -326772,7 +326772,7 @@ sub_80AC168:
 _080AC1A4: .4byte gUnknown_3001B88
 _080AC1A8: .4byte gUnknown_81184B0
 _080AC1AC: .4byte 0x0000ffff
-	thumb_func_end sub_80AC168
+	thumb_func_end GroundObject_Delete
 
 	thumb_func_start sub_80AC1B0
 sub_80AC1B0:
@@ -326923,8 +326923,8 @@ _080AC2B4:
 	bx r1
 	thumb_func_end sub_80AC274
 
-	thumb_func_start sub_80AC2BC
-sub_80AC2BC:
+	thumb_func_start GroundObject_ExecuteScript
+GroundObject_ExecuteScript:
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -326960,7 +326960,7 @@ _080AC2FC:
 	ldr r3, _080AC31C
 	adds r1, r5, 0
 	adds r2, r6, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	movs r0, 0x9E
 	lsls r0, 1
 	adds r1, r4, r0
@@ -326972,7 +326972,7 @@ _080AC314:
 	bx r1
 	.align 2, 0
 _080AC31C: .4byte gUnknown_8118504
-	thumb_func_end sub_80AC2BC
+	thumb_func_end GroundObject_ExecuteScript
 
 	thumb_func_start sub_80AC320
 sub_80AC320:
@@ -328016,8 +328016,8 @@ sub_80ACA30:
 	bx r1
 	thumb_func_end sub_80ACA30
 
-	thumb_func_start sub_80ACA3C
-sub_80ACA3C:
+	thumb_func_start GroundObject_Action
+GroundObject_Action:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -328047,7 +328047,7 @@ _080ACA54:
 	cmp r0, 0x4
 	bne _080ACA90
 	adds r0, r7, 0
-	bl sub_80AC168
+	bl GroundObject_Delete
 	b _080ACAB2
 	.align 2, 0
 _080ACA7C: .4byte gUnknown_3001B88
@@ -328092,7 +328092,7 @@ _080ACAB2:
 	bx r0
 	.align 2, 0
 _080ACAD0: .4byte gUnknown_8118530
-	thumb_func_end sub_80ACA3C
+	thumb_func_end GroundObject_Action
 
 	thumb_func_start sub_80ACAD4
 sub_80ACAD4:
@@ -328278,8 +328278,8 @@ sub_80ACC10:
 _080ACC28: .4byte gUnknown_3001B8C
 	thumb_func_end sub_80ACC10
 
-	thumb_func_start sub_80ACC2C
-sub_80ACC2C:
+	thumb_func_start GroundEffect_Select
+GroundEffect_Select:
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -328318,7 +328318,7 @@ _080ACC70:
 	adds r1, r5, 0
 	adds r2, r7, 0
 	adds r3, r6, 0
-	bl sub_80ACDC4
+	bl GroundEffect_Add
 	subs r4, 0x1
 	adds r5, 0xC
 	cmp r4, 0
@@ -328331,7 +328331,7 @@ _080ACC86:
 	.align 2, 0
 _080ACC90: .4byte gUnknown_8118610
 _080ACC94: .4byte gUnknown_811861C
-	thumb_func_end sub_80ACC2C
+	thumb_func_end GroundEffect_Select
 
 	thumb_func_start sub_80ACC98
 sub_80ACC98:
@@ -328493,8 +328493,8 @@ _080ACDBC:
 	bx r1
 	thumb_func_end sub_80ACD84
 
-	thumb_func_start sub_80ACDC4
-sub_80ACDC4:
+	thumb_func_start GroundEffect_Add
+GroundEffect_Add:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -328848,7 +328848,7 @@ _080AD062:
 _080AD074: .4byte gUnknown_8118544
 _080AD078: .4byte gUnknown_812F1F8
 _080AD07C: .4byte gUnknown_81186CC
-	thumb_func_end sub_80ACDC4
+	thumb_func_end GroundEffect_Add
 
 	thumb_func_start sub_80AD080
 sub_80AD080:
@@ -329034,8 +329034,8 @@ _080AD1CC:
 	bx r1
 	thumb_func_end sub_80AD18C
 
-	thumb_func_start sub_80AD1D4
-sub_80AD1D4:
+	thumb_func_start GroundEffect_ExecuteScript
+GroundEffect_ExecuteScript:
 	push {r4-r6,lr}
 	adds r3, r0, 0
 	adds r5, r1, 0
@@ -329071,7 +329071,7 @@ _080AD214:
 	ldr r3, _080AD234
 	adds r1, r5, 0
 	adds r2, r6, 0
-	bl sub_809D790
+	bl GroundScript_ExecutePP
 	movs r0, 0x9E
 	lsls r0, 1
 	adds r1, r4, r0
@@ -329083,7 +329083,7 @@ _080AD22C:
 	bx r1
 	.align 2, 0
 _080AD234: .4byte gUnknown_811872C
-	thumb_func_end sub_80AD1D4
+	thumb_func_end GroundEffect_ExecuteScript
 
 	thumb_func_start sub_80AD238
 sub_80AD238:
@@ -329818,8 +329818,8 @@ sub_80AD708:
 	bx r1
 	thumb_func_end sub_80AD708
 
-	thumb_func_start sub_80AD714
-sub_80AD714:
+	thumb_func_start GroundEffect_Action
+GroundEffect_Action:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -329894,7 +329894,7 @@ _080AD78A:
 	bx r0
 	.align 2, 0
 _080AD7A8: .4byte gUnknown_8118758
-	thumb_func_end sub_80AD714
+	thumb_func_end GroundEffect_Action
 
 	thumb_func_start sub_80AD7AC
 sub_80AD7AC:
@@ -330013,8 +330013,8 @@ sub_80AD874:
 _080AD87C: .4byte gUnknown_203B4B8
 	thumb_func_end sub_80AD874
 
-	thumb_func_start sub_80AD880
-sub_80AD880:
+	thumb_func_start GroundLink_Select
+GroundLink_Select:
 	push {lr}
 	lsls r0, 16
 	asrs r0, 16
@@ -330028,7 +330028,7 @@ sub_80AD880:
 	.align 2, 0
 _080AD898: .4byte gUnknown_8118798
 _080AD89C: .4byte gUnknown_203B4B8
-	thumb_func_end sub_80AD880
+	thumb_func_end GroundLink_Select
 
 	thumb_func_start sub_80AD8A0
 sub_80AD8A0:
@@ -330214,7 +330214,7 @@ _080AD9E0:
 	cmp r0, r6
 	beq _080AD9EE
 	adds r0, r1, 0
-	bl sub_80ADC34
+	bl GroundEvent_Delete
 _080AD9EE:
 	adds r0, r5, 0
 	movs r1, 0x80
@@ -330247,8 +330247,8 @@ sub_80ADA08:
 _080ADA20: .4byte gUnknown_3001B90
 	thumb_func_end sub_80ADA08
 
-	thumb_func_start sub_80ADA24
-sub_80ADA24:
+	thumb_func_start GroundEvent_Select
+GroundEvent_Select:
 	push {r4-r7,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -330287,7 +330287,7 @@ _080ADA68:
 	adds r1, r5, 0
 	adds r2, r7, 0
 	adds r3, r6, 0
-	bl sub_80ADB00
+	bl GroundEvent_Add
 	subs r4, 0x1
 	adds r5, 0xC
 	cmp r4, 0
@@ -330300,10 +330300,10 @@ _080ADA7E:
 	.align 2, 0
 _080ADA88: .4byte gUnknown_81187DC
 _080ADA8C: .4byte gUnknown_81187E8
-	thumb_func_end sub_80ADA24
+	thumb_func_end GroundEvent_Select
 
-	thumb_func_start sub_80ADA90
-sub_80ADA90:
+	thumb_func_start GroundEvent_Cancel
+GroundEvent_Cancel:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -330341,7 +330341,7 @@ _080ADABA:
 	bne _080ADADC
 _080ADAD6:
 	adds r0, r1, 0
-	bl sub_80ADC34
+	bl GroundEvent_Delete
 _080ADADC:
 	adds r0, r6, 0
 	movs r1, 0x80
@@ -330359,10 +330359,10 @@ _080ADADC:
 	.align 2, 0
 _080ADAF8: .4byte gUnknown_811880C
 _080ADAFC: .4byte gUnknown_3001B90
-	thumb_func_end sub_80ADA90
+	thumb_func_end GroundEvent_Cancel
 
-	thumb_func_start sub_80ADB00
-sub_80ADB00:
+	thumb_func_start GroundEvent_Add
+GroundEvent_Add:
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -330521,10 +330521,10 @@ _080ADC24:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80ADB00
+	thumb_func_end GroundEvent_Add
 
-	thumb_func_start sub_80ADC34
-sub_80ADC34:
+	thumb_func_start GroundEvent_Delete
+GroundEvent_Delete:
 	push {r4,lr}
 	adds r2, r0, 0
 	lsls r2, 16
@@ -330545,7 +330545,7 @@ sub_80ADC34:
 _080ADC58: .4byte gUnknown_3001B90
 _080ADC5C: .4byte gUnknown_811886C
 _080ADC60: .4byte 0x0000ffff
-	thumb_func_end sub_80ADC34
+	thumb_func_end GroundEvent_Delete
 
 	thumb_func_start sub_80ADC64
 sub_80ADC64:
diff --git a/asm/event_flag.s b/asm/event_flag.s
index 3fdcf00..d0fa546 100644
--- a/asm/event_flag.s
+++ b/asm/event_flag.s
@@ -1703,8 +1703,8 @@ _080020E0: .4byte 0x0000021e
 _080020E4: .4byte 0x00000113
 	thumb_func_end sub_8001D88
 
-	thumb_func_start sub_80020E8
-sub_80020E8:
+	thumb_func_start _FlagCalc
+_FlagCalc:
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -1792,10 +1792,10 @@ _08002194:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80020E8
+	thumb_func_end _FlagCalc
 
-	thumb_func_start sub_800219C
-sub_800219C:
+	thumb_func_start _FlagJudge
+_FlagJudge:
 	push {r4,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -1895,15 +1895,15 @@ _08002258:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800219C
+	thumb_func_end _FlagJudge
 
-	thumb_func_start sub_8002260
-sub_8002260:
+	thumb_func_start FlagCalc
+FlagCalc:
 	push {lr}
-	bl sub_80020E8
+	bl _FlagCalc
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8002260
+	thumb_func_end FlagCalc
 
 	thumb_func_start sub_800226C
 sub_800226C:
@@ -1920,7 +1920,7 @@ sub_800226C:
 	bl sub_8001658
 	adds r1, r5, 0
 	adds r2, r6, 0
-	bl sub_80020E8
+	bl _FlagCalc
 	adds r2, r0, 0
 	mov r0, r8
 	adds r1, r4, 0
@@ -1955,7 +1955,7 @@ sub_80022A0:
 	adds r1, r0, 0
 	adds r0, r6, 0
 	mov r2, r9
-	bl sub_80020E8
+	bl _FlagCalc
 	adds r2, r0, 0
 	mov r0, r8
 	adds r1, r5, 0
@@ -1971,7 +1971,7 @@ sub_80022A0:
 	thumb_func_start sub_80022E8
 sub_80022E8:
 	push {lr}
-	bl sub_800219C
+	bl _FlagJudge
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
@@ -1988,7 +1988,7 @@ sub_80022F8:
 	bl sub_8001658
 	adds r1, r4, 0
 	adds r2, r5, 0
-	bl sub_800219C
+	bl _FlagJudge
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r4,r5}
@@ -2016,7 +2016,7 @@ sub_8002318:
 	adds r1, r0, 0
 	adds r0, r5, 0
 	mov r2, r8
-	bl sub_800219C
+	bl _FlagJudge
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r3}
diff --git a/asm/memory.s b/asm/memory.s
index 88b3faa..e364f1b 100644
--- a/asm/memory.s
+++ b/asm/memory.s
@@ -496,8 +496,8 @@ _080031AC:
 	bx r1
 	thumb_func_end MemorySearchFromBack
 
-	thumb_func_start MemorySplitFront
-MemorySplitFront:
+	thumb_func_start _LocateSetFront
+_LocateSetFront:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -602,10 +602,10 @@ _08003260:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end MemorySplitFront
+	thumb_func_end _LocateSetFront
 
-	thumb_func_start MemorySplitBack
-MemorySplitBack:
+	thumb_func_start _LocateSetBack
+_LocateSetBack:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -706,10 +706,10 @@ _08003328:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end MemorySplitBack
+	thumb_func_end _LocateSetBack
 
-	thumb_func_start MemoryLocateSet
-MemoryLocateSet:
+	thumb_func_start _LocateSet
+_LocateSet:
 	push {r4-r7,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -739,7 +739,7 @@ _0800335C:
 	adds r0, r5, 0
 	adds r2, r4, 0
 	adds r3, r7, 0
-	bl MemorySplitFront
+	bl _LocateSetFront
 	ldr r0, [r0, 0xC]
 	b _080033CC
 	.align 2, 0
@@ -756,7 +756,7 @@ _08003394:
 	adds r0, r5, 0
 	adds r2, r4, 0
 	adds r3, r7, 0
-	bl MemorySplitBack
+	bl _LocateSetBack
 	ldr r0, [r0, 0xC]
 	b _080033CC
 _080033B4:
@@ -775,7 +775,7 @@ _080033CC:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end MemoryLocateSet
+	thumb_func_end _LocateSet
 
 	thumb_func_start MemoryAlloc
 MemoryAlloc:
@@ -803,8 +803,8 @@ MemoryFree:
 _080033FC: .4byte gUnknown_2000EB0
 	thumb_func_end MemoryFree
 
-	thumb_func_start CreateSubHeap
-CreateSubHeap:
+	thumb_func_start MemoryLocate_LocalCreate
+MemoryLocate_LocalCreate:
 	push {r4-r7,lr}
 	sub sp, 0xC
 	adds r4, r0, 0
@@ -835,7 +835,7 @@ _08003438:
 	adds r0, r4, 0
 	movs r2, 0x9
 	adds r3, r5, 0
-	bl MemorySplitBack
+	bl _LocateSetBack
 	ldr r1, [r0, 0xC]
 	str r1, [sp, 0x4]
 	ldr r0, [r0, 0x10]
@@ -848,7 +848,7 @@ _08003438:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end CreateSubHeap
+	thumb_func_end MemoryLocate_LocalCreate
 
 	thumb_func_start DoCreateSubHeap
 DoCreateSubHeap:
@@ -953,7 +953,7 @@ DoAlloc:
 	lsls r3, 1
 	orrs r3, r2
 	adds r2, r3, 0
-	bl MemoryLocateSet
+	bl _LocateSet
 	pop {r1}
 	bx r1
 	thumb_func_end DoAlloc