label functions

3 files changed, 57 insertions, 57 deletions

diff --git a/asm/code.s b/asm/code.s
index 708c7e6..ba969d1 100644
--- a/asm/code.s
+++ b/asm/code.s
@@ -171,21 +171,21 @@ GameLoop:
 	bl sub_800135C
 _080003D2:
 	movs r0, 0xE
-	bl sub_8001334
+	bl xxx_script_related_8001334
 	movs r0, 0xF
-	bl sub_8001334
+	bl xxx_script_related_8001334
 	movs r0, 0
 	movs r1, 0x39
 	bl sub_80015C0
 	movs r0, 0x10
-	bl sub_8001334
+	bl xxx_script_related_8001334
 	movs r0, 0
 	movs r1, 0x39
 	bl sub_8001658
 	cmp r0, 0
 	bne _080003FE
 	movs r0, 0x11
-	bl sub_8001334
+	bl xxx_script_related_8001334
 _080003FE:
 	movs r1, 0
 	mov r10, r1
@@ -1078,7 +1078,7 @@ _08000B78:
 	movs r0, 0x4
 	bl sub_800A8F8
 	movs r0, 0x5
-	bl sub_8001334
+	bl xxx_script_related_8001334
 	adds r5, r0, 0
 	b _08000BEC
 	.align 2, 0
@@ -1109,7 +1109,7 @@ _08000BBE:
 	movs r0, 0x4
 	bl sub_800A8F8
 	adds r0, r7, 0
-	bl sub_8001334
+	bl xxx_script_related_8001334
 	adds r5, r0, 0
 	cmp r5, 0xE
 	bne _08000BD8
@@ -1563,7 +1563,7 @@ _08000F78:
 	cmp r5, 0
 	beq _08000F92
 	adds r0, r4, 0
-	bl sub_8001340
+	bl xxx_dungeon_8001340
 	bl sub_8099648
 	bl sub_8094C14
 	movs r0, 0
@@ -2054,26 +2054,26 @@ nullsub_2:
 	bx lr
 	thumb_func_end nullsub_2
 
-	thumb_func_start sub_8001334
-sub_8001334:
+	thumb_func_start xxx_script_related_8001334
+xxx_script_related_8001334:
 	push {lr}
-	bl sub_8098468
+	bl xxx_script_related_8098468
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8001334
+	thumb_func_end xxx_script_related_8001334
 
-	thumb_func_start sub_8001340
-sub_8001340:
+	thumb_func_start xxx_dungeon_8001340
+xxx_dungeon_8001340:
 	push {r4,lr}
 	adds r4, r0, 0
 	bl nullsub_2
 	adds r0, r4, 0
-	bl sub_8042F6C
+	bl xxx_dungeon_8042F6C
 	bl NDS_LoadOverlay_GroundMain
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8001340
+	thumb_func_end xxx_dungeon_8001340
 
 	thumb_func_start nullsub_3
 nullsub_3:
diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index e84f79a..c51bcf1 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -102135,8 +102135,8 @@ _0803DA72:
 _0803DA78: .4byte 0x000037e4
 	thumb_func_end sub_803DA20
 
-	thumb_func_start sub_803DA7C
-sub_803DA7C:
+	thumb_func_start ShowDungeonNameBanner
+ShowDungeonNameBanner:
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -102218,7 +102218,7 @@ _0803DAFE:
 	cmp r0, 0x7
 	ble _0803DAF8
 	mov r0, r9
-	bl sub_803DE7C
+	bl CalcStringWidth
 	movs r1, 0xE0
 	subs r1, r0
 	lsrs r0, r1, 31
@@ -102284,7 +102284,7 @@ _0803DBBC:
 	bl sub_800D158
 _0803DBCA:
 	add r0, sp, 0x4
-	bl sub_803DE7C
+	bl CalcStringWidth
 	movs r1, 0xE0
 	subs r1, r0
 	lsrs r0, r1, 31
@@ -102314,7 +102314,7 @@ _0803DBEA:
 _0803DC08: .4byte gUnknown_80F6118
 _0803DC0C: .4byte gUnknown_20274A5
 _0803DC10: .4byte gUnknown_202EC8C
-	thumb_func_end sub_803DA7C
+	thumb_func_end ShowDungeonNameBanner
 
 	thumb_func_start sub_803DC14
 sub_803DC14:
@@ -102649,8 +102649,8 @@ _0803DDFE:
 _0803DE78: .4byte 0x0000023f
 	thumb_func_end sub_803DD30
 
-	thumb_func_start sub_803DE7C
-sub_803DE7C:
+	thumb_func_start CalcStringWidth
+CalcStringWidth:
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r5, 0
@@ -102693,7 +102693,7 @@ _0803DEBA:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_803DE7C
+	thumb_func_end CalcStringWidth
 
 	thumb_func_start sub_803DEC8
 sub_803DEC8:
@@ -113394,8 +113394,8 @@ _08042F64: .4byte 0xffff0000
 _08042F68: .4byte 0x0000ffff
 	thumb_func_end sub_8042EC8
 
-	thumb_func_start sub_8042F6C
-sub_8042F6C:
+	thumb_func_start xxx_dungeon_8042F6C
+xxx_dungeon_8042F6C:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -114072,7 +114072,7 @@ _08043544:
 	bl sub_8052210
 	adds r0, r6, 0
 	bl sub_803F27C
-	bl sub_803DA7C
+	bl ShowDungeonNameBanner
 	cmp r6, 0
 	bne _08043594
 	bl sub_804AFAC
@@ -114329,7 +114329,7 @@ _080437A2:
 	strb r4, [r0]
 _080437C8:
 	adds r0, r4, 0
-	bl sub_804423C
+	bl RunDungeon
 	movs r4, 0
 	bl sub_8044B28
 	lsls r0, 24
@@ -114909,7 +114909,7 @@ _08043CAC:
 	.align 2, 0
 _08043CD0: .4byte gUnknown_203B418
 _08043CD4: .4byte gUnknown_203B41C
-	thumb_func_end sub_8042F6C
+	thumb_func_end xxx_dungeon_8042F6C
 
 	thumb_func_start sub_8043CD8
 sub_8043CD8:
@@ -115634,8 +115634,8 @@ _08044236:
 	bx r1
 	thumb_func_end sub_8044210
 
-	thumb_func_start sub_804423C
-sub_804423C:
+	thumb_func_start RunDungeon
+RunDungeon:
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -115649,7 +115649,7 @@ sub_804423C:
 	cmp r0, 0
 	bne _080442C6
 	adds r0, r4, 0
-	bl sub_80442D0
+	bl xxx_dungeon_80442D0
 	lsls r0, 24
 	lsrs r4, r0, 24
 	bl sub_8044B28
@@ -115699,10 +115699,10 @@ _080442C6:
 	bx r0
 	.align 2, 0
 _080442CC: .4byte gUnknown_203B418
-	thumb_func_end sub_804423C
+	thumb_func_end RunDungeon
 
-	thumb_func_start sub_80442D0
-sub_80442D0:
+	thumb_func_start xxx_dungeon_80442D0
+xxx_dungeon_80442D0:
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
@@ -115882,7 +115882,7 @@ _0804444E:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80442D0
+	thumb_func_end xxx_dungeon_80442D0
 
 	thumb_func_start sub_8044454
 sub_8044454:
@@ -170411,7 +170411,7 @@ _0805F240:
 	negs r1, r1
 	str r1, [r0]
 	ldr r0, [sp, 0xC]
-	bl sub_805F94C
+	bl DrawFieldMenu
 	bl sub_8083600
 	movs r1, 0
 	bl sub_806A2BC
@@ -171214,8 +171214,8 @@ _0805F92A:
 	bx r0
 	thumb_func_end ShowFieldMenu
 
-	thumb_func_start sub_805F94C
-sub_805F94C:
+	thumb_func_start DrawFieldMenu
+DrawFieldMenu:
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -171502,7 +171502,7 @@ _0805FBD8: .4byte gUnknown_80F91C8
 _0805FBDC: .4byte gUnknown_203B418
 _0805FBE0: .4byte 0x0001357c
 _0805FBE4: .4byte gUnknown_80F91E0
-	thumb_func_end sub_805F94C
+	thumb_func_end DrawFieldMenu
 
 	thumb_func_start sub_805FBE8
 sub_805FBE8:
@@ -286447,8 +286447,8 @@ _08098460:
 	bx r1
 	thumb_func_end sub_8098434
 
-	thumb_func_start sub_8098468
-sub_8098468:
+	thumb_func_start xxx_script_related_8098468
+xxx_script_related_8098468:
 	push {r4-r7,lr}
 	sub sp, 0x8
 	ldr r1, _08098494
@@ -287228,7 +287228,7 @@ _08098BD2:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8098468
+	thumb_func_end xxx_script_related_8098468
 
 	thumb_func_start sub_8098BDC
 sub_8098BDC:
@@ -297487,8 +297487,8 @@ _0809DA68: .4byte gUnknown_2039AC0
 _0809DA6C: .4byte gUnknown_2039A36
 	thumb_func_end sub_809DA08
 
-	thumb_func_start sub_809DA70
-sub_809DA70:
+	thumb_func_start HandleAction
+HandleAction:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -299334,7 +299334,7 @@ _0809EABA:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809DA70
+	thumb_func_end HandleAction
 
 	thumb_func_start ExecuteScriptCommand
 ExecuteScriptCommand:
@@ -303250,7 +303250,7 @@ _080A0D16:
 	ldr r1, [sp, 0x10]
 	add r2, sp, 0x8
 	ldrb r2, [r2, 0x1]
-	bl sub_80022E8
+	bl FlagJudge
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A0D38
@@ -304198,7 +304198,7 @@ GroundScript_ExecuteTrigger:
 	str r0, [r5, 0x38]
 	ldr r1, _080A14D8
 	adds r0, r5, 0
-	bl sub_809DA70
+	bl HandleAction
 	adds r4, r0, 0
 	lsls r4, 16
 	asrs r4, 16
@@ -306064,7 +306064,7 @@ _080A2470:
 	ldr r1, [sp, 0x4]
 	mov r0, r8
 	movs r2, 0x2
-	bl sub_80022E8
+	bl FlagJudge
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A24F0
@@ -306079,7 +306079,7 @@ _080A249E:
 	ldr r1, [sp, 0x4]
 	ldrb r2, [r4, 0x1]
 	mov r0, r8
-	bl sub_80022E8
+	bl FlagJudge
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A24F0
@@ -306100,7 +306100,7 @@ _080A24BE:
 	adds r1, r0, 0
 	ldrb r2, [r4, 0x1]
 	mov r0, r8
-	bl sub_80022E8
+	bl FlagJudge
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A24F0
@@ -313301,7 +313301,7 @@ GroundMap_Action:
 	ldr r0, _080A59D4
 	ldr r0, [r0]
 	ldr r1, _080A59D8
-	bl sub_809DA70
+	bl HandleAction
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -324759,7 +324759,7 @@ _080AB278:
 	adds r4, 0x38
 	ldr r1, _080AB2A0
 	adds r0, r4, 0
-	bl sub_809DA70
+	bl HandleAction
 	lsls r0, 16
 	asrs r3, r0, 16
 	cmp r3, 0
@@ -328039,7 +328039,7 @@ _080ACA54:
 	adds r4, 0x38
 	adds r0, r4, 0
 	ldr r1, _080ACA80
-	bl sub_809DA70
+	bl HandleAction
 	lsls r0, 16
 	asrs r0, 16
 	cmp r0, 0
@@ -329841,7 +329841,7 @@ _080AD72C:
 	adds r4, 0x38
 	adds r0, r4, 0
 	ldr r1, _080AD758
-	bl sub_809DA70
+	bl HandleAction
 	lsls r0, 16
 	asrs r0, 16
 	cmp r0, 0
diff --git a/asm/event_flag.s b/asm/event_flag.s
index d0fa546..aea4c65 100644
--- a/asm/event_flag.s
+++ b/asm/event_flag.s
@@ -1968,15 +1968,15 @@ sub_80022A0:
 	bx r0
 	thumb_func_end sub_80022A0
 
-	thumb_func_start sub_80022E8
-sub_80022E8:
+	thumb_func_start FlagJudge
+FlagJudge:
 	push {lr}
 	bl _FlagJudge
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80022E8
+	thumb_func_end FlagJudge
 
 	thumb_func_start sub_80022F8
 sub_80022F8: