label functions

2 files changed, 40 insertions, 40 deletions

diff --git a/asm/code.s b/asm/code.s
index 633eb5b..5eb7421 100644
--- a/asm/code.s
+++ b/asm/code.s
@@ -134,11 +134,11 @@ GameLoop:
 	movs r0, 0x1
 	mov r9, r0
 	bl InitHeap
-	bl sub_8011A38
+	bl NDS_DebugInit
 	bl sub_801180C
-	bl nullsub_1
+	bl NDS_LoadOverlay_GroundMain
 	bl sub_8014144
-	bl sub_808CDC0
+	bl LoadMonsterParameters
 	bl sub_8097670
 	bl sub_8094F88
 	bl sub_8094980
@@ -158,7 +158,7 @@ GameLoop:
 	movs r0, 0x1
 	bl sub_8094998
 	ldr r0, _08000498
-	bl nullsub_22
+	bl SetWindowTitle
 	bl sub_800DAAC
 	movs r0, 0
 	bl SetSavingIconCoords
@@ -2044,10 +2044,10 @@ _08001324: .4byte gUnknown_203B460
 _08001328: .4byte gUnknown_203B45C
 	thumb_func_end sub_80012C0
 
-	thumb_func_start nullsub_1
-nullsub_1:
+	thumb_func_start NDS_LoadOverlay_GroundMain
+NDS_LoadOverlay_GroundMain:
 	bx lr
-	thumb_func_end nullsub_1
+	thumb_func_end NDS_LoadOverlay_GroundMain
 
 	thumb_func_start nullsub_2
 nullsub_2:
@@ -2069,7 +2069,7 @@ sub_8001340:
 	bl nullsub_2
 	adds r0, r4, 0
 	bl sub_8042F6C
-	bl nullsub_1
+	bl NDS_LoadOverlay_GroundMain
 	pop {r4}
 	pop {r0}
 	bx r0
diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index 55fecd6..f6413cd 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -3226,10 +3226,10 @@ sub_800CDC8:
 _0800CDD0: .4byte gUnknown_202D800
 	thumb_func_end sub_800CDC8
 
-	thumb_func_start nullsub_22
-nullsub_22:
+	thumb_func_start SetWindowTitle
+SetWindowTitle:
 	bx lr
-	thumb_func_end nullsub_22
+	thumb_func_end SetWindowTitle
 
 	thumb_func_start nullsub_23
 nullsub_23:
@@ -13331,8 +13331,8 @@ sub_8011A2C:
 _08011A34: .4byte gUnknown_202DE1C
 	thumb_func_end sub_8011A2C
 
-	thumb_func_start sub_8011A38
-sub_8011A38:
+	thumb_func_start NDS_DebugInit
+NDS_DebugInit:
 	push {lr}
 	bl nullsub_26
 	bl nullsub_27
@@ -13348,7 +13348,7 @@ sub_8011A38:
 	bx r0
 	.align 2, 0
 _08011A60: .4byte gUnknown_203B14C
-	thumb_func_end sub_8011A38
+	thumb_func_end NDS_DebugInit
 
 	thumb_func_start nullsub_25
 nullsub_25:
@@ -13360,8 +13360,8 @@ nullsub_26:
 	bx lr
 	thumb_func_end nullsub_26
 
-	thumb_func_start sub_8011A6C
-sub_8011A6C:
+	thumb_func_start PrintFuncFileLineOrNotEntry
+PrintFuncFileLineOrNotEntry:
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
@@ -13389,10 +13389,10 @@ _08011A98:
 	bx r0
 	.align 2, 0
 _08011AA0: .4byte gUnknown_80D41B0
-	thumb_func_end sub_8011A6C
+	thumb_func_end PrintFuncFileLineOrNotEntry
 
-	thumb_func_start sub_8011AA4
-sub_8011AA4:
+	thumb_func_start PrintFuncFileLine
+PrintFuncFileLine:
 	push {r4,r5,lr}
 	sub sp, 0x8
 	ldr r5, _08011AC4
@@ -13409,10 +13409,10 @@ sub_8011AA4:
 	bx r0
 	.align 2, 0
 _08011AC4: .4byte gUnknown_80D41C4
-	thumb_func_end sub_8011AA4
+	thumb_func_end PrintFuncFileLine
 
-	thumb_func_start sub_8011AC8
-sub_8011AC8:
+	thumb_func_start PrintMessageWithFuncFileLine
+PrintMessageWithFuncFileLine:
 	push {r2,r3}
 	push {r4,r5,lr}
 	sub sp, 0x4
@@ -13438,7 +13438,7 @@ sub_8011AC8:
 	bx r3
 	.align 2, 0
 _08011AFC: .4byte gUnknown_80D41EC
-	thumb_func_end sub_8011AC8
+	thumb_func_end PrintMessageWithFuncFileLine
 
 	thumb_func_start nullsub_199
 nullsub_199:
@@ -13502,30 +13502,30 @@ nullsub_137:
 	bx lr
 	thumb_func_end nullsub_137
 
-	thumb_func_start sub_8011B4C
-sub_8011B4C:
+	thumb_func_start FatalErrorPrintFuncFileLine
+FatalErrorPrintFuncFileLine:
 	push {lr}
 	sub sp, 0x100
 	adds r2, r0, 0
 	cmp r2, 0
 	beq _08011B5E
 	mov r0, sp
-	bl sub_8011AA4
+	bl PrintFuncFileLine
 	b _08011B66
 _08011B5E:
 	ldr r2, _08011B6C
 	mov r0, sp
-	bl sub_8011AA4
+	bl PrintFuncFileLine
 _08011B66:
 	add sp, 0x100
 	pop {r0}
 	bx r0
 	.align 2, 0
 _08011B6C: .4byte gUnknown_80D421C
-	thumb_func_end sub_8011B4C
+	thumb_func_end FatalErrorPrintFuncFileLine
 
-	thumb_func_start sub_8011B70
-sub_8011B70:
+	thumb_func_start FatalErrorFormatMessage
+FatalErrorFormatMessage:
 	push {r0-r3}
 	push {lr}
 	sub sp, 0x100
@@ -13537,7 +13537,7 @@ sub_8011B70:
 	pop {r3}
 	add sp, 0x10
 	bx r3
-	thumb_func_end sub_8011B70
+	thumb_func_end FatalErrorFormatMessage
 
 	thumb_func_start sub_8011B88
 sub_8011B88:
@@ -13621,13 +13621,13 @@ nullsub_32:
 	bx lr
 	thumb_func_end nullsub_32
 
-	thumb_func_start sub_8011BE0
-sub_8011BE0:
+	thumb_func_start FatalErrorHang
+FatalErrorHang:
 	push {lr}
 	bl Hang
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8011BE0
+	thumb_func_end FatalErrorHang
 
 	thumb_func_start FatalError
 FatalError:
@@ -13637,15 +13637,15 @@ FatalError:
 	adds r1, r0, 0
 	ldr r4, [sp, 0x108]
 	ldr r0, _08011C14
-	bl sub_8011B4C
+	bl FatalErrorPrintFuncFileLine
 	add r2, sp, 0x10C
 	mov r0, sp
 	adds r1, r4, 0
 	bl vsprintf
 	ldr r0, _08011C18
 	mov r1, sp
-	bl sub_8011B70
-	bl sub_8011BE0
+	bl FatalErrorFormatMessage
+	bl FatalErrorHang
 	.align 2, 0
 _08011C14: .4byte gUnknown_80D42C0
 _08011C18: .4byte gUnknown_80D42D4
@@ -261095,8 +261095,8 @@ sub_808CDB0:
 _0808CDBC: .4byte gUnknown_8107544
 	thumb_func_end sub_808CDB0
 
-	thumb_func_start sub_808CDC0
-sub_808CDC0:
+	thumb_func_start LoadMonsterParameters
+LoadMonsterParameters:
 	push {lr}
 	ldr r1, _0808CDE4
 	ldr r0, _0808CDE8
@@ -261122,7 +261122,7 @@ _0808CDF0: .4byte gUnknown_8300500
 _0808CDF4: .4byte gUnknown_202F3E4
 _0808CDF8: .4byte gUnknown_202F3E0
 _0808CDFC: .4byte gUnknown_20384E8
-	thumb_func_end sub_808CDC0
+	thumb_func_end LoadMonsterParameters
 
 	thumb_func_start sub_808CE00
 sub_808CE00: