update for modified assembler

1 files changed, 865 insertions, 865 deletions

diff --git a/asm/text_renderer.s b/asm/text_renderer.s
index ead79ede9..4301addaf 100644
--- a/asm/text_renderer.s
+++ b/asm/text_renderer.s
@@ -1,6 +1,6 @@
 	thumb_func_start fboxes_set_ptr
-@ void fboxes_set_ptr(struct fbox *ptr)
-fboxes_set_ptr: @ 80045A4
+; void fboxes_set_ptr(struct fbox *ptr)
+fboxes_set_ptr: ; 80045A4
 	ldr r1, =0x03002f80
 	str r0, [r1]
 	bx lr
@@ -9,18 +9,18 @@ fboxes_set_ptr: @ 80045A4
 	thumb_func_end fboxes_set_ptr
 
 	thumb_func_start TextBox_ResetSomeField
-@ void TextBox_ResetSomeField()
-TextBox_ResetSomeField: @ 80045B0
+; void TextBox_ResetSomeField()
+TextBox_ResetSomeField: ; 80045B0
 	push {lr}
 	ldr r1, =0x020201b0
 	movs r2, 0
 	ldr r3, =0x0000045c
 	adds r0, r1, r3
-_080045BA:
+@080045BA:
 	strb r2, [r0, 0x1B]
 	subs r0, 0x24
 	cmp r0, r1
-	bge _080045BA
+	bge @080045BA
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -28,8 +28,8 @@ _080045BA:
 	thumb_func_end TextBox_ResetSomeField
 
 	thumb_func_start Print
-@ int Print(u8 windowId, u8 fontId, int char_cursor, char x, char y, u8 a6, int a7)
-Print: @ 80045D0
+; int Print(u8 windowId, u8 fontId, int char_cursor, char x, char y, u8 a6, int a7)
+Print: ; 80045D0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -118,8 +118,8 @@ Print: @ 80045D0
 	thumb_func_end Print
 
 	thumb_func_start remo_copy
-@ int remo_copy(struct TextBox *x, u8 text_speed, int a3)
-remo_copy: @ 800467C
+; int remo_copy(struct TextBox *x, u8 text_speed, int a3)
+remo_copy: ; 800467C
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	mov r12, r2
@@ -128,12 +128,12 @@ remo_copy: @ 800467C
 	ldr r0, =0x03002f80
 	ldr r0, [r0]
 	cmp r0, 0
-	bne _08004698
+	bne @08004698
 	movs r0, 0
-	b _08004766
+	b @08004766
 	.align 2, 0
 	.pool
-_08004698:
+@08004698:
 	ldr r0, =0x0202018c
 	movs r2, 0
 	movs r1, 0x1
@@ -145,12 +145,12 @@ _08004698:
 	adds r4, r0, 0
 	movs r1, 0x6
 	adds r0, 0x1A
-_080046AE:
+@080046AE:
 	strb r2, [r0]
 	subs r0, 0x1
 	subs r1, 0x1
 	cmp r1, 0
-	bge _080046AE
+	bge @080046AE
 	adds r1, r4, 0
 	adds r0, r6, 0
 	ldm r0!, {r2,r3,r7}
@@ -173,9 +173,9 @@ _080046AE:
 	lsrs r2, 4
 	bl GenerateFontHalfRowLut
 	cmp r5, 0xFF
-	beq _08004718
+	beq @08004718
 	cmp r5, 0
-	beq _08004718
+	beq @08004718
 	ldrb r0, [r4, 0x1D]
 	subs r0, 0x1
 	strb r0, [r4, 0x1D]
@@ -192,37 +192,37 @@ _080046AE:
 	stm r1!, {r2,r3,r7}
 	ldm r0!, {r2,r4,r7}
 	stm r1!, {r2,r4,r7}
-	b _0800475E
+	b @0800475E
 	.align 2, 0
 	.pool
-_08004718:
+@08004718:
 	ldr r1, =0x0202018c
 	movs r0, 0
 	strb r0, [r1, 0x1D]
 	movs r4, 0
 	ldr r7, =0x000003ff
-	b _08004732
+	b @08004732
 	.align 2, 0
 	.pool
-_0800472C:
+@0800472C:
 	adds r0, r4, 0x1
 	lsls r0, 16
 	lsrs r4, r0, 16
-_08004732:
+@08004732:
 	cmp r4, r7
-	bhi _08004740
+	bhi @08004740
 	ldr r0, =0x0202018c
 	bl fbox_exec
 	cmp r0, 0x1
-	bne _0800472C
-_08004740:
+	bne @0800472C
+@08004740:
 	cmp r5, 0xFF
-	beq _0800474E
+	beq @0800474E
 	ldr r0, =0x0202018c
 	ldrb r0, [r0, 0x4]
 	movs r1, 0x2
 	bl Window_CopyToVram
-_0800474E:
+@0800474E:
 	ldr r2, =0x020201b0
 	ldrb r1, [r6, 0x4]
 	lsls r0, r1, 3
@@ -231,12 +231,12 @@ _0800474E:
 	adds r0, r2
 	movs r1, 0
 	strb r1, [r0, 0x1B]
-_0800475E:
+@0800475E:
 	ldr r1, =0x03002f84
 	movs r0, 0
 	strb r0, [r1]
 	movs r0, 0x1
-_08004766:
+@08004766:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
@@ -245,71 +245,71 @@ _08004766:
 	thumb_func_end remo_copy
 
 	thumb_func_start run_remoboxes
-@ void run_remoboxes()
-run_remoboxes: @ 8004778
+; void run_remoboxes()
+run_remoboxes: ; 8004778
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
 	ldr r0, =0x03002f84
 	ldrb r0, [r0]
 	cmp r0, 0
-	bne _080047F6
+	bne @080047F6
 	ldr r0, =0x020201b0
 	movs r6, 0
 	adds r5, r0, 0x4
 	mov r8, r0
 	movs r7, 0x1F
-_08004790:
+@08004790:
 	ldrb r0, [r5, 0x17]
 	cmp r0, 0
-	beq _080047E8
+	beq @080047E8
 	mov r0, r8
 	bl fbox_exec
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, 0x1
-	beq _080047E4
+	beq @080047E4
 	cmp r4, 0x1
-	bgt _080047B8
+	bgt @080047B8
 	cmp r4, 0
-	beq _080047BE
-	b _080047E8
+	beq @080047BE
+	b @080047E8
 	.align 2, 0
 	.pool
-_080047B8:
+@080047B8:
 	cmp r4, 0x3
-	beq _080047C6
-	b _080047E8
-_080047BE:
+	beq @080047C6
+	b @080047E8
+@080047BE:
 	ldrb r0, [r5]
 	movs r1, 0x2
 	bl Window_CopyToVram
-_080047C6:
+@080047C6:
 	ldr r1, =0x020201b0
 	adds r0, r1, 0
 	adds r0, 0x10
 	adds r0, r6, r0
 	ldr r2, [r0]
 	cmp r2, 0
-	beq _080047E8
+	beq @080047E8
 	adds r0, r6, r1
 	adds r1, r4, 0
 	bl _call_via_r2
-	b _080047E8
+	b @080047E8
 	.align 2, 0
 	.pool
-_080047E4:
+@080047E4:
 	movs r0, 0
 	strb r0, [r5, 0x17]
-_080047E8:
+@080047E8:
 	adds r6, 0x24
 	adds r5, 0x24
 	movs r0, 0x24
 	add r8, r0
 	subs r7, 0x1
 	cmp r7, 0
-	bge _08004790
-_080047F6:
+	bge @08004790
+@080047F6:
 	pop {r3}
 	mov r8, r3
 	pop {r4-r7}
@@ -318,7 +318,7 @@ _080047F6:
 	thumb_func_end run_remoboxes
 
 	thumb_func_start a_pressed_maybe
-a_pressed_maybe: @ 8004800
+a_pressed_maybe: ; 8004800
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =0x020201b0
@@ -333,11 +333,11 @@ a_pressed_maybe: @ 8004800
 	thumb_func_end a_pressed_maybe
 
 	thumb_func_start fbox_exec
-@ int fbox_exec(struct TextBox *x)
-fbox_exec: @ 8004818
+; int fbox_exec(struct TextBox *x)
+fbox_exec: ; 8004818
 	push {r4,lr}
 	adds r4, r0, 0
-_0800481C:
+@0800481C:
 	ldrb r1, [r4, 0x5]
 	ldr r0, =0x03002f80
 	ldr r2, [r0]
@@ -351,7 +351,7 @@ _0800481C:
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x2
-	beq _0800481C
+	beq @0800481C
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -360,7 +360,7 @@ _0800481C:
 	thumb_func_end fbox_exec
 
 	thumb_func_start GenerateFontHalfRowLut
-GenerateFontHalfRowLut: @ 8004844
+GenerateFontHalfRowLut: ; 8004844
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -820,7 +820,7 @@ GenerateFontHalfRowLut: @ 8004844
 	thumb_func_end GenerateFontHalfRowLut
 
 	thumb_func_start save_remo_colors
-save_remo_colors: @ 8004BE0
+save_remo_colors: ; 8004BE0
 	ldr r3, =0x030009ea
 	ldrh r3, [r3]
 	strb r3, [r1]
@@ -836,7 +836,7 @@ save_remo_colors: @ 8004BE0
 	thumb_func_end save_remo_colors
 
 	thumb_func_start restore_remo_colors
-restore_remo_colors: @ 8004C00
+restore_remo_colors: ; 8004C00
 	push {lr}
 	ldrb r0, [r0]
 	ldrb r1, [r1]
@@ -847,8 +847,8 @@ restore_remo_colors: @ 8004C00
 	thumb_func_end restore_remo_colors
 
 	thumb_func_start DecompressGlyphTile
-@ void DecompressGlyphTile(u16 *src, u32 *dest)
-DecompressGlyphTile: @ 8004C10
+; void DecompressGlyphTile(u16 *src, u32 *dest)
+DecompressGlyphTile: ; 8004C10
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1013,50 +1013,50 @@ DecompressGlyphTile: @ 8004C10
 	thumb_func_end DecompressGlyphTile
 
 	thumb_func_start sub_8004D58
-sub_8004D58: @ 8004D58
+sub_8004D58: ; 8004D58
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
 	cmp r0, 0x1
-	beq _08004D8C
+	beq @08004D8C
 	cmp r0, 0x1
-	bgt _08004D6E
+	bgt @08004D6E
 	cmp r0, 0
-	beq _08004D74
-	b _08004D98
-_08004D6E:
+	beq @08004D74
+	b @08004D98
+@08004D6E:
 	cmp r1, 0x2
-	beq _08004D80
-	b _08004D98
-_08004D74:
+	beq @08004D80
+	b @08004D98
+@08004D74:
 	ldr r0, =0x030009ec
 	ldrb r0, [r0]
-	b _08004D9A
+	b @08004D9A
 	.align 2, 0
 	.pool
-_08004D80:
+@08004D80:
 	ldr r0, =0x030009ea
 	ldrb r0, [r0]
-	b _08004D9A
+	b @08004D9A
 	.align 2, 0
 	.pool
-_08004D8C:
+@08004D8C:
 	ldr r0, =0x030009ee
 	ldrb r0, [r0]
-	b _08004D9A
+	b @08004D9A
 	.align 2, 0
 	.pool
-_08004D98:
+@08004D98:
 	movs r0, 0
-_08004D9A:
+@08004D9A:
 	pop {r1}
 	bx r1
 	thumb_func_end sub_8004D58
 
 	thumb_func_start CopyGlyphToWindow
-@ int CopyGlyphToWindow(struct TextBox *x)
-CopyGlyphToWindow: @ 8004DA0
+; int CopyGlyphToWindow(struct TextBox *x)
+CopyGlyphToWindow: ; 8004DA0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1080,9 +1080,9 @@ CopyGlyphToWindow: @ 8004DA0
 	adds r0, 0x80
 	ldrb r0, [r0]
 	cmp r4, r0
-	ble _08004DD2
+	ble @08004DD2
 	adds r4, r0, 0
-_08004DD2:
+@08004DD2:
 	ldrb r0, [r1, 0x4]
 	lsls r0, 3
 	ldrb r3, [r3, 0x9]
@@ -1091,9 +1091,9 @@ _08004DD2:
 	adds r1, 0x81
 	ldrb r1, [r1]
 	cmp r0, r1
-	ble _08004DE6
+	ble @08004DE6
 	adds r0, r1, 0
-_08004DE6:
+@08004DE6:
 	str r6, [sp]
 	mov r8, r3
 	adds r3, r5, 0
@@ -1102,11 +1102,11 @@ _08004DE6:
 	lsls r1, r7, 5
 	str r1, [sp, 0x4]
 	cmp r4, 0x8
-	ble _08004DFA
-	b _08004F94
-_08004DFA:
+	ble @08004DFA
+	b @08004F94
+@08004DFA:
 	cmp r0, 0x8
-	bgt _08004E84
+	bgt @08004E84
 	mov r1, r8
 	str r3, [sp, 0x8]
 	adds r2, r6, 0
@@ -1116,9 +1116,9 @@ _08004DFA:
 	str r0, [sp, 0xC]
 	str r6, [sp, 0x10]
 	cmp r1, r0
-	bcc _08004E14
-	b _080052AA
-_08004E14:
+	bcc @08004E14
+	b @080052AA
+@08004E14:
 	ldr r3, [sp, 0x8]
 	ldm r3!, {r5}
 	str r3, [sp, 0x8]
@@ -1126,7 +1126,7 @@ _08004E14:
 	adds r0, r1, 0x1
 	mov r10, r0
 	cmp r4, r8
-	bcs _08004E72
+	bcs @08004E72
 	movs r2, 0x7
 	mov r12, r2
 	lsrs r0, r1, 3
@@ -1137,12 +1137,12 @@ _08004E14:
 	mov r3, r12
 	ands r1, r3
 	lsls r6, r1, 2
-_08004E38:
+@08004E38:
 	adds r3, r5, 0
 	movs r0, 0xF
 	ands r3, r0
 	cmp r3, 0
-	beq _08004E6A
+	beq @08004E6A
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1163,20 +1163,20 @@ _08004E38:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_08004E6A:
+@08004E6A:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r8
-	bcc _08004E38
-_08004E72:
+	bcc @08004E38
+@08004E72:
 	mov r1, r10
 	ldr r2, [sp, 0xC]
 	cmp r1, r2
-	bcc _08004E14
-	b _080052AA
+	bcc @08004E14
+	b @080052AA
 	.align 2, 0
 	.pool
-_08004E84:
+@08004E84:
 	mov r1, r8
 	str r3, [sp, 0x14]
 	ldr r3, [sp]
@@ -1194,8 +1194,8 @@ _08004E84:
 	subs r0, 0x8
 	str r0, [sp, 0x80]
 	cmp r1, r3
-	bcs _08004F0E
-_08004EA8:
+	bcs @08004F0E
+@08004EA8:
 	ldr r0, [sp, 0x14]
 	ldm r0!, {r5}
 	str r0, [sp, 0x14]
@@ -1203,7 +1203,7 @@ _08004EA8:
 	adds r2, r1, 0x1
 	mov r8, r2
 	cmp r4, r12
-	bcs _08004F06
+	bcs @08004F06
 	movs r3, 0x7
 	mov r10, r3
 	lsrs r0, r1, 3
@@ -1214,12 +1214,12 @@ _08004EA8:
 	mov r0, r10
 	ands r1, r0
 	lsls r6, r1, 2
-_08004ECC:
+@08004ECC:
 	adds r3, r5, 0
 	movs r1, 0xF
 	ands r3, r1
 	cmp r3, 0
-	beq _08004EFE
+	beq @08004EFE
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1240,17 +1240,17 @@ _08004ECC:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_08004EFE:
+@08004EFE:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r12
-	bcc _08004ECC
-_08004F06:
+	bcc @08004ECC
+@08004F06:
 	mov r1, r8
 	ldr r2, [sp, 0x18]
 	cmp r1, r2
-	bcc _08004EA8
-_08004F0E:
+	bcc @08004EA8
+@08004F0E:
 	ldr r1, [sp, 0x88]
 	ldr r3, =0x03002fd0
 	str r3, [sp, 0x20]
@@ -1262,9 +1262,9 @@ _08004F0E:
 	ldr r3, [sp]
 	str r3, [sp, 0x28]
 	cmp r1, r2
-	bcc _08004F28
-	b _080052AA
-_08004F28:
+	bcc @08004F28
+	b @080052AA
+@08004F28:
 	ldr r0, [sp, 0x20]
 	ldm r0!, {r5}
 	str r0, [sp, 0x20]
@@ -1272,7 +1272,7 @@ _08004F28:
 	adds r2, r1, 0x1
 	mov r10, r2
 	cmp r4, r8
-	bcs _08004F86
+	bcs @08004F86
 	movs r3, 0x7
 	mov r12, r3
 	lsrs r0, r1, 3
@@ -1283,12 +1283,12 @@ _08004F28:
 	mov r0, r12
 	ands r1, r0
 	lsls r6, r1, 2
-_08004F4C:
+@08004F4C:
 	adds r3, r5, 0
 	movs r1, 0xF
 	ands r3, r1
 	cmp r3, 0
-	beq _08004F7E
+	beq @08004F7E
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1309,24 +1309,24 @@ _08004F4C:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_08004F7E:
+@08004F7E:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r8
-	bcc _08004F4C
-_08004F86:
+	bcc @08004F4C
+@08004F86:
 	mov r1, r10
 	ldr r2, [sp, 0x24]
 	cmp r1, r2
-	bcc _08004F28
-	b _080052AA
+	bcc @08004F28
+	b @080052AA
 	.align 2, 0
 	.pool
-_08004F94:
+@08004F94:
 	cmp r0, 0x8
-	ble _08004F9A
-	b _080050A4
-_08004F9A:
+	ble @08004F9A
+	b @080050A4
+@08004F9A:
 	mov r1, r8
 	str r3, [sp, 0x2C]
 	ldr r3, [sp]
@@ -1342,8 +1342,8 @@ _08004F9A:
 	subs r4, 0x8
 	str r4, [sp, 0x7C]
 	cmp r8, r2
-	bcs _0800501C
-_08004FBA:
+	bcs @0800501C
+@08004FBA:
 	ldr r0, [sp, 0x2C]
 	ldm r0!, {r5}
 	str r0, [sp, 0x2C]
@@ -1351,7 +1351,7 @@ _08004FBA:
 	adds r2, r1, 0x1
 	mov r10, r2
 	cmp r4, r12
-	bcs _08005014
+	bcs @08005014
 	lsrs r0, r1, 3
 	ldr r2, [sp, 0x4]
 	adds r3, r0, 0
@@ -1360,12 +1360,12 @@ _08004FBA:
 	movs r3, 0x7
 	ands r1, r3
 	lsls r6, r1, 2
-_08004FDA:
+@08004FDA:
 	adds r3, r5, 0
 	movs r0, 0xF
 	ands r3, r0
 	cmp r3, 0
-	beq _0800500C
+	beq @0800500C
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1386,17 +1386,17 @@ _08004FDA:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_0800500C:
+@0800500C:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r12
-	bcc _08004FDA
-_08005014:
+	bcc @08004FDA
+@08005014:
 	mov r1, r10
 	ldr r2, [sp, 0x30]
 	cmp r1, r2
-	bcc _08004FBA
-_0800501C:
+	bcc @08004FBA
+@0800501C:
 	mov r1, r8
 	ldr r3, =0x03002fb0
 	str r3, [sp, 0x38]
@@ -1409,9 +1409,9 @@ _0800501C:
 	ldr r0, [sp, 0x84]
 	str r0, [sp, 0x40]
 	cmp r1, r3
-	bcc _08005038
-	b _080052AA
-_08005038:
+	bcc @08005038
+	b @080052AA
+@08005038:
 	ldr r2, [sp, 0x38]
 	ldm r2!, {r5}
 	str r2, [sp, 0x38]
@@ -1419,7 +1419,7 @@ _08005038:
 	adds r3, r1, 0x1
 	mov r10, r3
 	cmp r4, r8
-	bcs _08005096
+	bcs @08005096
 	movs r0, 0x7
 	mov r12, r0
 	lsrs r0, r1, 3
@@ -1430,12 +1430,12 @@ _08005038:
 	mov r0, r12
 	ands r1, r0
 	lsls r6, r1, 2
-_0800505C:
+@0800505C:
 	adds r3, r5, 0
 	movs r1, 0xF
 	ands r3, r1
 	cmp r3, 0
-	beq _0800508E
+	beq @0800508E
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1456,20 +1456,20 @@ _0800505C:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_0800508E:
+@0800508E:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r8
-	bcc _0800505C
-_08005096:
+	bcc @0800505C
+@08005096:
 	mov r1, r10
 	ldr r2, [sp, 0x3C]
 	cmp r1, r2
-	bcc _08005038
-	b _080052AA
+	bcc @08005038
+	b @080052AA
 	.align 2, 0
 	.pool
-_080050A4:
+@080050A4:
 	mov r1, r8
 	str r5, [sp, 0x44]
 	ldr r3, [sp]
@@ -1488,8 +1488,8 @@ _080050A4:
 	subs r4, 0x8
 	str r4, [sp, 0x7C]
 	cmp r8, r2
-	bcs _0800512C
-_080050CA:
+	bcs @0800512C
+@080050CA:
 	ldr r2, [sp, 0x44]
 	ldm r2!, {r5}
 	str r2, [sp, 0x44]
@@ -1497,7 +1497,7 @@ _080050CA:
 	adds r3, r1, 0x1
 	mov r10, r3
 	cmp r4, r12
-	bcs _08005124
+	bcs @08005124
 	lsrs r0, r1, 3
 	ldr r3, [sp, 0x4]
 	adds r2, r0, 0
@@ -1506,12 +1506,12 @@ _080050CA:
 	movs r0, 0x7
 	ands r1, r0
 	lsls r6, r1, 2
-_080050EA:
+@080050EA:
 	adds r3, r5, 0
 	movs r1, 0xF
 	ands r3, r1
 	cmp r3, 0
-	beq _0800511C
+	beq @0800511C
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1532,17 +1532,17 @@ _080050EA:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_0800511C:
+@0800511C:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r12
-	bcc _080050EA
-_08005124:
+	bcc @080050EA
+@08005124:
 	mov r1, r10
 	ldr r2, [sp, 0x48]
 	cmp r1, r2
-	bcc _080050CA
-_0800512C:
+	bcc @080050CA
+@0800512C:
 	mov r1, r8
 	ldr r3, =0x03002fb0
 	str r3, [sp, 0x50]
@@ -1555,8 +1555,8 @@ _0800512C:
 	ldr r0, [sp, 0x84]
 	str r0, [sp, 0x58]
 	cmp r1, r3
-	bcs _080051AC
-_08005146:
+	bcs @080051AC
+@08005146:
 	ldr r2, [sp, 0x50]
 	ldm r2!, {r5}
 	str r2, [sp, 0x50]
@@ -1564,7 +1564,7 @@ _08005146:
 	adds r3, r1, 0x1
 	mov r10, r3
 	cmp r4, r8
-	bcs _080051A4
+	bcs @080051A4
 	movs r0, 0x7
 	mov r12, r0
 	lsrs r0, r1, 3
@@ -1575,12 +1575,12 @@ _08005146:
 	mov r0, r12
 	ands r1, r0
 	lsls r6, r1, 2
-_0800516A:
+@0800516A:
 	adds r3, r5, 0
 	movs r1, 0xF
 	ands r3, r1
 	cmp r3, 0
-	beq _0800519C
+	beq @0800519C
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1601,17 +1601,17 @@ _0800516A:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_0800519C:
+@0800519C:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r8
-	bcc _0800516A
-_080051A4:
+	bcc @0800516A
+@080051A4:
 	mov r1, r10
 	ldr r2, [sp, 0x54]
 	cmp r1, r2
-	bcc _08005146
-_080051AC:
+	bcc @08005146
+@080051AC:
 	ldr r1, [sp, 0x88]
 	ldr r3, =0x03002fd0
 	str r3, [sp, 0x5C]
@@ -1623,8 +1623,8 @@ _080051AC:
 	ldr r3, [sp]
 	str r3, [sp, 0x64]
 	cmp r1, r2
-	bcs _0800522A
-_080051C4:
+	bcs @0800522A
+@080051C4:
 	ldr r0, [sp, 0x5C]
 	ldm r0!, {r5}
 	str r0, [sp, 0x5C]
@@ -1632,7 +1632,7 @@ _080051C4:
 	adds r2, r1, 0x1
 	mov r10, r2
 	cmp r4, r8
-	bcs _08005222
+	bcs @08005222
 	movs r3, 0x7
 	mov r12, r3
 	lsrs r0, r1, 3
@@ -1643,12 +1643,12 @@ _080051C4:
 	mov r0, r12
 	ands r1, r0
 	lsls r6, r1, 2
-_080051E8:
+@080051E8:
 	adds r3, r5, 0
 	movs r1, 0xF
 	ands r3, r1
 	cmp r3, 0
-	beq _0800521A
+	beq @0800521A
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1669,17 +1669,17 @@ _080051E8:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_0800521A:
+@0800521A:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r8
-	bcc _080051E8
-_08005222:
+	bcc @080051E8
+@08005222:
 	mov r1, r10
 	ldr r2, [sp, 0x60]
 	cmp r1, r2
-	bcc _080051C4
-_0800522A:
+	bcc @080051C4
+@0800522A:
 	ldr r4, [sp, 0x84]
 	ldr r1, [sp, 0x88]
 	ldr r3, =0x03002ff0
@@ -1692,8 +1692,8 @@ _0800522A:
 	str r2, [sp, 0x6C]
 	str r4, [sp, 0x70]
 	cmp r1, r2
-	bcs _080052AA
-_08005244:
+	bcs @080052AA
+@08005244:
 	ldr r3, [sp, 0x68]
 	ldm r3!, {r5}
 	str r3, [sp, 0x68]
@@ -1701,7 +1701,7 @@ _08005244:
 	adds r0, r1, 0x1
 	mov r10, r0
 	cmp r4, r8
-	bcs _080052A2
+	bcs @080052A2
 	movs r2, 0x7
 	mov r12, r2
 	lsrs r0, r1, 3
@@ -1712,12 +1712,12 @@ _08005244:
 	mov r3, r12
 	ands r1, r3
 	lsls r6, r1, 2
-_08005268:
+@08005268:
 	adds r3, r5, 0
 	movs r0, 0xF
 	ands r3, r0
 	cmp r3, 0
-	beq _0800529A
+	beq @0800529A
 	lsrs r2, r4, 3
 	lsls r2, 5
 	add r2, r9
@@ -1738,17 +1738,17 @@ _08005268:
 	ands r0, r1
 	orrs r3, r0
 	strb r3, [r2]
-_0800529A:
+@0800529A:
 	lsrs r5, 4
 	adds r4, 0x1
 	cmp r4, r8
-	bcc _08005268
-_080052A2:
+	bcc @08005268
+@080052A2:
 	mov r1, r10
 	ldr r2, [sp, 0x6C]
 	cmp r1, r2
-	bcc _08005244
-_080052AA:
+	bcc @08005244
+@080052AA:
 	add sp, 0x8C
 	pop {r3-r5}
 	mov r8, r3
@@ -1762,8 +1762,8 @@ _080052AA:
 	thumb_func_end CopyGlyphToWindow
 
 	thumb_func_start Text_ClearHorizontalSpan
-@ void Text_ClearHorizontalSpan(TextBox *textBox, int width)
-Text_ClearHorizontalSpan: @ 80052C8
+; void Text_ClearHorizontalSpan(TextBox *textBox, int width)
+Text_ClearHorizontalSpan: ; 80052C8
 	push {r4-r6,lr}
 	sub sp, 0x10
 	adds r4, r0, 0
@@ -1771,7 +1771,7 @@ Text_ClearHorizontalSpan: @ 80052C8
 	ldr r0, =0x030009ea
 	ldrh r5, [r0]
 	cmp r5, 0
-	beq _0800531E
+	beq @0800531E
 	ldrb r1, [r4, 0x4]
 	lsls r0, r1, 1
 	adds r0, r1
@@ -1806,7 +1806,7 @@ Text_ClearHorizontalSpan: @ 80052C8
 	str r0, [sp, 0x4]
 	add r0, sp, 0x8
 	bl PixelBlock_FillRect4Bpp
-_0800531E:
+@0800531E:
 	add sp, 0x10
 	pop {r4-r6}
 	pop {r0}
@@ -1816,8 +1816,8 @@ _0800531E:
 	thumb_func_end Text_ClearHorizontalSpan
 
 	thumb_func_start Font0Func
-@ int Font0Func(struct TextBox *x)
-Font0Func: @ 800533C
+; int Font0Func(struct TextBox *x)
+Font0Func: ; 800533C
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1826,7 +1826,7 @@ Font0Func: @ 800533C
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _08005360
+	bne @08005360
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -1836,7 +1836,7 @@ Font0Func: @ 800533C
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_08005360:
+@08005360:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -1846,8 +1846,8 @@ _08005360:
 	thumb_func_end Font0Func
 
 	thumb_func_start Font1Func
-@ int Font1Func(struct TextBox *x)
-Font1Func: @ 8005370
+; int Font1Func(struct TextBox *x)
+Font1Func: ; 8005370
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1856,7 +1856,7 @@ Font1Func: @ 8005370
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _08005398
+	bne @08005398
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -1868,7 +1868,7 @@ Font1Func: @ 8005370
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_08005398:
+@08005398:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -1878,8 +1878,8 @@ _08005398:
 	thumb_func_end Font1Func
 
 	thumb_func_start Font2Func
-@ int Font2Func(struct TextBox *x)
-Font2Func: @ 80053A8
+; int Font2Func(struct TextBox *x)
+Font2Func: ; 80053A8
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1888,7 +1888,7 @@ Font2Func: @ 80053A8
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _080053D0
+	bne @080053D0
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -1900,7 +1900,7 @@ Font2Func: @ 80053A8
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_080053D0:
+@080053D0:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -1910,8 +1910,8 @@ _080053D0:
 	thumb_func_end Font2Func
 
 	thumb_func_start Font3Func
-@ int Font3Func(struct TextBox *x)
-Font3Func: @ 80053E0
+; int Font3Func(struct TextBox *x)
+Font3Func: ; 80053E0
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1920,7 +1920,7 @@ Font3Func: @ 80053E0
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _08005408
+	bne @08005408
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -1932,7 +1932,7 @@ Font3Func: @ 80053E0
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_08005408:
+@08005408:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -1942,8 +1942,8 @@ _08005408:
 	thumb_func_end Font3Func
 
 	thumb_func_start Font4Func
-@ int Font4Func(struct TextBox *x)
-Font4Func: @ 8005418
+; int Font4Func(struct TextBox *x)
+Font4Func: ; 8005418
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1952,7 +1952,7 @@ Font4Func: @ 8005418
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _08005440
+	bne @08005440
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -1964,7 +1964,7 @@ Font4Func: @ 8005418
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_08005440:
+@08005440:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -1974,8 +1974,8 @@ _08005440:
 	thumb_func_end Font4Func
 
 	thumb_func_start Font5Func
-@ int Font5Func(struct TextBox *x)
-Font5Func: @ 8005450
+; int Font5Func(struct TextBox *x)
+Font5Func: ; 8005450
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -1984,7 +1984,7 @@ Font5Func: @ 8005450
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _08005478
+	bne @08005478
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -1996,7 +1996,7 @@ Font5Func: @ 8005450
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_08005478:
+@08005478:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -2006,8 +2006,8 @@ _08005478:
 	thumb_func_end Font5Func
 
 	thumb_func_start Font7Func
-@ int Font7Func(struct TextBox *x)
-Font7Func: @ 8005488
+; int Font7Func(struct TextBox *x)
+Font7Func: ; 8005488
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -2016,7 +2016,7 @@ Font7Func: @ 8005488
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _080054B0
+	bne @080054B0
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -2028,7 +2028,7 @@ Font7Func: @ 8005488
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_080054B0:
+@080054B0:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -2038,8 +2038,8 @@ _080054B0:
 	thumb_func_end Font7Func
 
 	thumb_func_start Font8Func
-@ int Font8Func(struct TextBox *x)
-Font8Func: @ 80054C0
+; int Font8Func(struct TextBox *x)
+Font8Func: ; 80054C0
 	push {lr}
 	adds r2, r0, 0
 	adds r3, r2, 0
@@ -2048,7 +2048,7 @@ Font8Func: @ 80054C0
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	bne _080054E8
+	bne @080054E8
 	ldrb r1, [r2, 0x14]
 	movs r0, 0x10
 	negs r0, r0
@@ -2060,7 +2060,7 @@ Font8Func: @ 80054C0
 	movs r1, 0x80
 	orrs r0, r1
 	strb r0, [r3, 0x1]
-_080054E8:
+@080054E8:
 	adds r0, r2, 0
 	bl font_render_b
 	lsls r0, 16
@@ -2070,8 +2070,8 @@ _080054E8:
 	thumb_func_end Font8Func
 
 	thumb_func_start sub_80054F8
-@ void sub_80054F8(TextBox *textBox)
-sub_80054F8: @ 80054F8
+; void sub_80054F8(TextBox *textBox)
+sub_80054F8: ; 80054F8
 	push {lr}
 	adds r2, r0, 0
 	adds r2, 0x14
@@ -2080,13 +2080,13 @@ sub_80054F8: @ 80054F8
 	movs r0, 0x4
 	ands r0, r1
 	cmp r0, 0
-	beq _08005514
+	beq @08005514
 	movs r0, 0
 	strb r0, [r2, 0x2]
-	b _08005524
+	b @08005524
 	.align 2, 0
 	.pool
-_08005514:
+@08005514:
 	ldrb r0, [r2, 0x1]
 	movs r1, 0x61
 	negs r1, r1
@@ -2095,14 +2095,14 @@ _08005514:
 	negs r0, r0
 	ands r1, r0
 	strb r1, [r2, 0x1]
-_08005524:
+@08005524:
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80054F8
 
 	thumb_func_start remo_draw_bouncing_down_arrow
-@ int remo_draw_bouncing_down_arrow(TextBox *x)
-remo_draw_bouncing_down_arrow: @ 8005528
+; int remo_draw_bouncing_down_arrow(TextBox *x)
+remo_draw_bouncing_down_arrow: ; 8005528
 	push {r4-r7,lr}
 	sub sp, 0x18
 	adds r5, r0, 0
@@ -2113,12 +2113,12 @@ remo_draw_bouncing_down_arrow: @ 8005528
 	movs r0, 0x4
 	ands r0, r1
 	cmp r0, 0
-	bne _080055EE
+	bne @080055EE
 	ldrb r2, [r6, 0x1]
 	movs r0, 0x1F
 	ands r0, r2
 	cmp r0, 0
-	beq _08005560
+	beq @08005560
 	ldr r0, [r5, 0x14]
 	lsls r0, 19
 	lsrs r0, 27
@@ -2127,10 +2127,10 @@ remo_draw_bouncing_down_arrow: @ 8005528
 	ands r0, r1
 	movs r1, 0x20
 	negs r1, r1
-	b _080055E8
+	b @080055E8
 	.align 2, 0
 	.pool
-_08005560:
+@08005560:
 	ldrb r0, [r5, 0x4]
 	ldrb r2, [r5, 0xD]
 	lsls r2, 28
@@ -2148,17 +2148,17 @@ _08005560:
 	lsls r0, 30
 	lsrs r0, 31
 	cmp r0, 0
-	beq _0800558A
+	beq @0800558A
 	cmp r0, 0x1
-	beq _08005594
-_0800558A:
+	beq @08005594
+@0800558A:
 	ldr r7, =gDownArrowTiles
-	b _08005596
+	b @08005596
 	.align 2, 0
 	.pool
-_08005594:
+@08005594:
 	ldr r7, =gDarkDownArrowTiles
-_08005596:
+@08005596:
 	ldrb r0, [r5, 0x4]
 	ldr r2, =gDownArrowYCoords
 	ldr r1, [r6]
@@ -2198,11 +2198,11 @@ _08005596:
 	lsls r0, 5
 	movs r2, 0x61
 	negs r2, r2
-_080055E8:
+@080055E8:
 	ands r1, r2
 	orrs r1, r0
 	strb r1, [r6, 0x1]
-_080055EE:
+@080055EE:
 	add sp, 0x18
 	pop {r4-r7}
 	pop {r0}
@@ -2212,8 +2212,8 @@ _080055EE:
 	thumb_func_end remo_draw_bouncing_down_arrow
 
 	thumb_func_start remo_clear_down_arrow
-@ int remo_clear_down_arrow(TextBox *x)
-remo_clear_down_arrow: @ 8005600
+; int remo_clear_down_arrow(TextBox *x)
+remo_clear_down_arrow: ; 8005600
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
@@ -2240,27 +2240,27 @@ remo_clear_down_arrow: @ 8005600
 	thumb_func_end remo_clear_down_arrow
 
 	thumb_func_start remo_is_it_time_to_continue_autopilot
-@ int remo_is_it_time_to_continue_autopilot(struct TextBox *x)
-remo_is_it_time_to_continue_autopilot: @ 8005634
+; int remo_is_it_time_to_continue_autopilot(struct TextBox *x)
+remo_is_it_time_to_continue_autopilot: ; 8005634
 	push {lr}
 	adds r1, r0, 0
 	adds r1, 0x14
 	ldrb r0, [r1, 0x2]
 	cmp r0, 0x31
-	beq _08005648
+	beq @08005648
 	adds r0, 0x1
 	strb r0, [r1, 0x2]
 	movs r0, 0
-	b _0800564A
-_08005648:
+	b @0800564A
+@08005648:
 	movs r0, 0x1
-_0800564A:
+@0800564A:
 	pop {r1}
 	bx r1
 	thumb_func_end remo_is_it_time_to_continue_autopilot
 
 	thumb_func_start remo_is_it_time_to_continue_plus_down_arrow
-remo_is_it_time_to_continue_plus_down_arrow: @ 8005650
+remo_is_it_time_to_continue_plus_down_arrow: ; 8005650
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r4, 0
@@ -2269,15 +2269,15 @@ remo_is_it_time_to_continue_plus_down_arrow: @ 8005650
 	movs r0, 0x4
 	ands r0, r1
 	cmp r0, 0
-	beq _08005674
+	beq @08005674
 	adds r0, r2, 0
 	bl remo_is_it_time_to_continue_autopilot
 	lsls r0, 24
 	lsrs r4, r0, 24
-	b _0800568E
+	b @0800568E
 	.align 2, 0
 	.pool
-_08005674:
+@08005674:
 	adds r0, r2, 0
 	bl remo_draw_bouncing_down_arrow
 	ldr r0, =0x030022c0
@@ -2285,11 +2285,11 @@ _08005674:
 	movs r0, 0x3
 	ands r0, r1
 	cmp r0, 0
-	beq _0800568E
+	beq @0800568E
 	movs r4, 0x1
 	movs r0, 0x5
 	bl audio_play
-_0800568E:
+@0800568E:
 	adds r0, r4, 0
 	pop {r4}
 	pop {r1}
@@ -2299,7 +2299,7 @@ _0800568E:
 	thumb_func_end remo_is_it_time_to_continue_plus_down_arrow
 
 	thumb_func_start remo_is_it_time_to_continue
-remo_is_it_time_to_continue: @ 800569C
+remo_is_it_time_to_continue: ; 800569C
 	push {r4,lr}
 	adds r2, r0, 0
 	movs r4, 0
@@ -2308,25 +2308,25 @@ remo_is_it_time_to_continue: @ 800569C
 	movs r0, 0x4
 	ands r0, r1
 	cmp r0, 0
-	beq _080056C0
+	beq @080056C0
 	adds r0, r2, 0
 	bl remo_is_it_time_to_continue_autopilot
 	lsls r0, 24
 	lsrs r4, r0, 24
-	b _080056D4
+	b @080056D4
 	.align 2, 0
 	.pool
-_080056C0:
+@080056C0:
 	ldr r0, =0x030022c0
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0x3
 	ands r0, r1
 	cmp r0, 0
-	beq _080056D4
+	beq @080056D4
 	movs r4, 0x1
 	movs r0, 0x5
 	bl audio_play
-_080056D4:
+@080056D4:
 	adds r0, r4, 0
 	pop {r4}
 	pop {r1}
@@ -2336,7 +2336,7 @@ _080056D4:
 	thumb_func_end remo_is_it_time_to_continue
 
 	thumb_func_start draw_bouncing_down_arrow_2
-draw_bouncing_down_arrow_2: @ 80056E0
+draw_bouncing_down_arrow_2: ; 80056E0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2362,11 +2362,11 @@ draw_bouncing_down_arrow_2: @ 80056E0
 	mov r1, r9
 	ldrb r0, [r1]
 	cmp r0, 0
-	beq _0800571A
+	beq @0800571A
 	subs r0, 0x1
 	strb r0, [r1]
-	b _0800579A
-_0800571A:
+	b @0800579A
+@0800571A:
 	lsls r1, r3, 4
 	orrs r1, r3
 	lsls r1, 24
@@ -2380,23 +2380,23 @@ _0800571A:
 	adds r3, r7, 0
 	bl Window_FillPixelRect
 	cmp r4, 0
-	bne _0800579A
+	bne @0800579A
 	ldr r0, =0x03003014
 	ldr r0, [r0]
 	lsls r0, 30
 	lsrs r0, 31
 	cmp r0, 0
-	beq _08005748
+	beq @08005748
 	cmp r0, 0x1
-	beq _08005754
-_08005748:
+	beq @08005754
+@08005748:
 	ldr r6, =gDownArrowTiles
-	b _08005756
+	b @08005756
 	.align 2, 0
 	.pool
-_08005754:
+@08005754:
 	ldr r6, =gDarkDownArrowTiles
-_08005756:
+@08005756:
 	ldr r2, =gDownArrowYCoords
 	mov r0, r10
 	ldrb r1, [r0]
@@ -2429,7 +2429,7 @@ _08005756:
 	ldrb r0, [r5]
 	adds r0, 0x1
 	strb r0, [r5]
-_0800579A:
+@0800579A:
 	add sp, 0x18
 	pop {r3-r5}
 	mov r8, r3
@@ -2443,54 +2443,54 @@ _0800579A:
 	thumb_func_end draw_bouncing_down_arrow_2
 
 	thumb_func_start font_render_b
-@ int font_render_b(struct TextBox *x)
-font_render_b: @ 80057B4
+; int font_render_b(struct TextBox *x)
+font_render_b: ; 80057B4
 	push {r4-r6,lr}
 	adds r6, r0, 0
 	adds r4, r6, 0
 	adds r4, 0x14
 	ldrb r0, [r6, 0x1C]
 	cmp r0, 0x6
-	bls _080057C4
-	b _08005D6C
-_080057C4:
+	bls @080057C4
+	b @08005D6C
+@080057C4:
 	lsls r0, 2
-	ldr r1, =_080057D4
+	ldr r1, =@080057D4
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_080057D4:
-	.4byte _080057F0
-	.4byte _08005C78
-	.4byte _08005C8C
-	.4byte _08005CB8
-	.4byte _08005CF0
-	.4byte _08005D48
-	.4byte _08005D5A
-_080057F0:
+@080057D4:
+	.4byte @080057F0
+	.4byte @08005C78
+	.4byte @08005C8C
+	.4byte @08005CB8
+	.4byte @08005CF0
+	.4byte @08005D48
+	.4byte @08005D5A
+@080057F0:
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x2C]
 	movs r0, 0x3
 	ands r0, r1
 	cmp r0, 0
-	beq _0800580A
+	beq @0800580A
 	ldrb r1, [r4]
 	movs r0, 0x10
 	ands r0, r1
 	cmp r0, 0
-	beq _0800580A
+	beq @0800580A
 	movs r0, 0
 	strb r0, [r6, 0x1E]
-_0800580A:
+@0800580A:
 	ldrb r1, [r6, 0x1E]
 	cmp r1, 0
-	beq _0800584C
+	beq @0800584C
 	ldrb r0, [r6, 0x1D]
 	cmp r0, 0
-	beq _0800584C
+	beq @0800584C
 	subs r0, r1, 0x1
 	strb r0, [r6, 0x1E]
 	ldr r0, =0x03003014
@@ -2498,46 +2498,46 @@ _0800580A:
 	movs r0, 0x1
 	ands r0, r1
 	cmp r0, 0
-	bne _08005828
-	b _08005B56
-_08005828:
+	bne @08005828
+	b @08005B56
+@08005828:
 	ldrh r1, [r2, 0x2E]
 	movs r0, 0x3
 	ands r0, r1
 	cmp r0, 0
-	bne _08005834
-	b _08005B56
-_08005834:
+	bne @08005834
+	b @08005B56
+@08005834:
 	ldrb r0, [r4]
 	movs r1, 0x10
 	orrs r0, r1
 	strb r0, [r4]
 	movs r0, 0
 	strb r0, [r6, 0x1E]
-	b _08005B56
+	b @08005B56
 	.align 2, 0
 	.pool
-_0800584C:
+@0800584C:
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
 	movs r1, 0x80
 	lsls r1, 17
 	ands r0, r1
 	cmp r0, 0
-	bne _08005874
+	bne @08005874
 	ldr r0, =0x03003014
 	ldrb r1, [r0]
 	movs r0, 0x4
 	ands r0, r1
 	cmp r0, 0
-	beq _08005874
+	beq @08005874
 	movs r0, 0x3
-	b _08005876
+	b @08005876
 	.align 2, 0
 	.pool
-_08005874:
+@08005874:
 	ldrb r0, [r6, 0x1D]
-_08005876:
+@08005876:
 	strb r0, [r6, 0x1E]
 	ldr r0, [r6]
 	ldrb r3, [r0]
@@ -2546,27 +2546,27 @@ _08005876:
 	adds r0, r3, 0
 	subs r0, 0xF8
 	cmp r0, 0x7
-	bls _0800588A
-	b _08005B90
-_0800588A:
+	bls @0800588A
+	b @08005B90
+@0800588A:
 	lsls r0, 2
-	ldr r1, =_08005898
+	ldr r1, =@08005898
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08005898:
-	.4byte _08005B6C
-	.4byte _08005B5A
-	.4byte _08005B4C
-	.4byte _08005B48
-	.4byte _080058E0
-	.4byte _080058DC
-	.4byte _080058B8
-	.4byte _08005D6C
-_080058B8:
+@08005898:
+	.4byte @08005B6C
+	.4byte @08005B5A
+	.4byte @08005B4C
+	.4byte @08005B48
+	.4byte @080058E0
+	.4byte @080058DC
+	.4byte @080058B8
+	.4byte @08005D6C
+@080058B8:
 	ldrb r0, [r6, 0x6]
 	strb r0, [r6, 0x8]
 	ldrb r1, [r6, 0x5]
@@ -2581,56 +2581,56 @@ _080058B8:
 	adds r1, r0
 	ldrb r0, [r6, 0x9]
 	adds r0, r1
-	b _08005ABA
+	b @08005ABA
 	.align 2, 0
 	.pool
-_080058DC:
+@080058DC:
 	ldr r0, [r6]
-	b _08005B30
-_080058E0:
+	b @08005B30
+@080058E0:
 	ldr r0, [r6]
 	ldrb r3, [r0]
 	adds r0, 0x1
 	str r0, [r6]
 	subs r0, r3, 0x1
 	cmp r0, 0x17
-	bls _080058F0
-	b _08005B90
-_080058F0:
+	bls @080058F0
+	b @08005B90
+@080058F0:
 	lsls r0, 2
-	ldr r1, =_08005900
+	ldr r1, =@08005900
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08005900:
-	.4byte _08005960
-	.4byte _08005982
-	.4byte _080059A6
-	.4byte _080059C0
-	.4byte _08005A0E
-	.4byte _08005A12
-	.4byte _08005A0A
-	.4byte _08005A2A
-	.4byte _08005A3A
-	.4byte _08005A58
-	.4byte _08005A5C
-	.4byte _08005B5A
-	.4byte _08005A90
-	.4byte _08005A98
-	.4byte _08005AA4
-	.4byte _08005A76
-	.4byte _08005AD8
-	.4byte _08005AF2
-	.4byte _08005B02
-	.4byte _08005B26
-	.4byte _08005B36
-	.4byte _08005B3E
-	.4byte _08005ABE
-	.4byte _08005ACC
-_08005960:
+@08005900:
+	.4byte @08005960
+	.4byte @08005982
+	.4byte @080059A6
+	.4byte @080059C0
+	.4byte @08005A0E
+	.4byte @08005A12
+	.4byte @08005A0A
+	.4byte @08005A2A
+	.4byte @08005A3A
+	.4byte @08005A58
+	.4byte @08005A5C
+	.4byte @08005B5A
+	.4byte @08005A90
+	.4byte @08005A98
+	.4byte @08005AA4
+	.4byte @08005A76
+	.4byte @08005AD8
+	.4byte @08005AF2
+	.4byte @08005B02
+	.4byte @08005B26
+	.4byte @08005B36
+	.4byte @08005B3E
+	.4byte @08005ABE
+	.4byte @08005ACC
+@08005960:
 	ldr r2, [r6]
 	ldrb r1, [r2]
 	lsls r1, 4
@@ -2647,8 +2647,8 @@ _08005960:
 	lsls r1, r2, 28
 	lsrs r1, 28
 	lsrs r2, 4
-	b _08005A06
-_08005982:
+	b @08005A06
+@08005982:
 	ldr r1, [r6]
 	ldrb r2, [r1]
 	movs r0, 0xF
@@ -2666,8 +2666,8 @@ _08005982:
 	lsls r1, r2, 28
 	lsrs r1, 28
 	lsrs r2, 4
-	b _08005A06
-_080059A6:
+	b @08005A06
+@080059A6:
 	ldr r1, [r6]
 	ldrb r0, [r1]
 	lsls r0, 4
@@ -2680,8 +2680,8 @@ _080059A6:
 	str r1, [r6]
 	ldrb r0, [r6, 0xC]
 	lsrs r0, 4
-	b _080059FE
-_080059C0:
+	b @080059FE
+@080059C0:
 	ldr r3, [r6]
 	ldrb r1, [r3]
 	lsls r1, 4
@@ -2713,20 +2713,20 @@ _080059C0:
 	str r4, [r6]
 	lsls r0, 24
 	lsrs r0, 28
-_080059FE:
+@080059FE:
 	lsls r1, r2, 28
 	lsrs r1, 28
 	lsls r2, 24
 	lsrs r2, 28
-_08005A06:
+@08005A06:
 	bl GenerateFontHalfRowLut
-_08005A0A:
+@08005A0A:
 	movs r0, 0x2
-	b _08005D6E
-_08005A0E:
+	b @08005D6E
+@08005A0E:
 	ldr r0, [r6]
-	b _08005B30
-_08005A12:
+	b @08005B30
+@08005A12:
 	ldr r0, [r6]
 	ldrb r0, [r0]
 	movs r1, 0xF
@@ -2738,8 +2738,8 @@ _08005A12:
 	orrs r0, r1
 	strb r0, [r4]
 	ldr r0, [r6]
-	b _08005B30
-_08005A2A:
+	b @08005B30
+@08005A2A:
 	ldr r0, [r6]
 	ldrb r1, [r0]
 	strb r1, [r6, 0x1E]
@@ -2747,8 +2747,8 @@ _08005A2A:
 	str r0, [r6]
 	movs r0, 0x6
 	strb r0, [r6, 0x1C]
-	b _08005A0A
-_08005A3A:
+	b @08005A0A
+@08005A3A:
 	movs r0, 0x1
 	strb r0, [r6, 0x1C]
 	ldr r0, =0x03003014
@@ -2756,18 +2756,18 @@ _08005A3A:
 	movs r0, 0x4
 	ands r0, r1
 	cmp r0, 0
-	bne _08005A4C
-	b _08005B56
-_08005A4C:
+	bne @08005A4C
+	b @08005B56
+@08005A4C:
 	movs r0, 0
 	strb r0, [r4, 0x2]
-	b _08005B56
+	b @08005B56
 	.align 2, 0
 	.pool
-_08005A58:
+@08005A58:
 	movs r0, 0x5
-	b _08005D56
-_08005A5C:
+	b @08005D56
+@08005A5C:
 	ldr r0, [r6]
 	ldrb r3, [r0]
 	adds r1, r0, 0x1
@@ -2779,8 +2779,8 @@ _08005A5C:
 	str r1, [r6]
 	adds r0, r3, 0
 	bl song_play_for_text
-	b _08005A0A
-_08005A76:
+	b @08005A0A
+@08005A76:
 	ldr r0, [r6]
 	ldrb r3, [r0]
 	adds r1, r0, 0x1
@@ -2792,20 +2792,20 @@ _08005A76:
 	str r1, [r6]
 	adds r0, r3, 0
 	bl audio_play
-	b _08005A0A
-_08005A90:
+	b @08005A0A
+@08005A90:
 	ldr r1, [r6]
 	ldrb r0, [r1]
 	ldrb r3, [r6, 0x6]
-	b _08005AF8
-_08005A98:
+	b @08005AF8
+@08005A98:
 	ldr r1, [r6]
 	ldrb r0, [r1]
 	ldrb r2, [r6, 0x7]
 	adds r0, r2
 	strb r0, [r6, 0x9]
-	b _08005AFC
-_08005AA4:
+	b @08005AFC
+@08005AA4:
 	ldrb r0, [r6, 0x4]
 	ldrb r2, [r6, 0xD]
 	lsls r2, 28
@@ -2816,46 +2816,46 @@ _08005AA4:
 	ldrb r0, [r6, 0x6]
 	strb r0, [r6, 0x8]
 	ldrb r0, [r6, 0x7]
-_08005ABA:
+@08005ABA:
 	strb r0, [r6, 0x9]
-	b _08005A0A
-_08005ABE:
+	b @08005A0A
+@08005ABE:
 	ldr r0, =0x03007420
 	bl MPlayStop_rev01
-	b _08005A0A
+	b @08005A0A
 	.align 2, 0
 	.pool
-_08005ACC:
+@08005ACC:
 	ldr r0, =0x03007420
 	bl m4aMPlayContinue
-	b _08005A0A
+	b @08005A0A
 	.align 2, 0
 	.pool
-_08005AD8:
+@08005AD8:
 	ldr r0, [r6]
 	ldrb r4, [r0]
 	adds r0, 0x1
 	str r0, [r6]
 	cmp r4, 0
-	ble _08005A0A
+	ble @08005A0A
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl Text_ClearHorizontalSpan
 	ldrb r0, [r6, 0x8]
 	adds r0, r4
-	b _08005C6E
-_08005AF2:
+	b @08005C6E
+@08005AF2:
 	ldr r1, [r6]
 	ldrb r0, [r6, 0x6]
 	ldrb r3, [r1]
-_08005AF8:
+@08005AF8:
 	adds r0, r3
 	strb r0, [r6, 0x8]
-_08005AFC:
+@08005AFC:
 	adds r1, 0x1
 	str r1, [r6]
-	b _08005A0A
-_08005B02:
+	b @08005A0A
+@08005B02:
 	ldr r0, [r6]
 	ldrb r2, [r0]
 	ldrb r1, [r6, 0x6]
@@ -2865,50 +2865,50 @@ _08005B02:
 	ldrb r0, [r6, 0x8]
 	subs r4, r2, r0
 	cmp r4, 0
-	bgt _08005B18
-	b _08005A0A
-_08005B18:
+	bgt @08005B18
+	b @08005A0A
+@08005B18:
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl Text_ClearHorizontalSpan
 	ldrb r0, [r6, 0x8]
 	adds r0, r4
-	b _08005C6E
-_08005B26:
+	b @08005C6E
+@08005B26:
 	ldr r0, [r6]
 	ldrb r2, [r0]
 	adds r1, r6, 0
 	adds r1, 0x20
 	strb r2, [r1]
-_08005B30:
+@08005B30:
 	adds r0, 0x1
 	str r0, [r6]
-	b _08005A0A
-_08005B36:
+	b @08005A0A
+@08005B36:
 	adds r1, r6, 0
 	adds r1, 0x21
 	movs r0, 0x1
-	b _08005B44
-_08005B3E:
+	b @08005B44
+@08005B3E:
 	adds r1, r6, 0
 	adds r1, 0x21
 	movs r0, 0
-_08005B44:
+@08005B44:
 	strb r0, [r1]
-	b _08005A0A
-_08005B48:
+	b @08005A0A
+@08005B48:
 	movs r0, 0x2
-	b _08005B4E
-_08005B4C:
+	b @08005B4E
+@08005B4C:
 	movs r0, 0x3
-_08005B4E:
+@08005B4E:
 	strb r0, [r6, 0x1C]
 	adds r0, r6, 0
 	bl sub_80054F8
-_08005B56:
+@08005B56:
 	movs r0, 0x3
-	b _08005D6E
-_08005B5A:
+	b @08005D6E
+@08005B5A:
 	ldr r0, [r6]
 	ldrb r3, [r0]
 	movs r2, 0x80
@@ -2917,8 +2917,8 @@ _08005B5A:
 	orrs r3, r1
 	adds r0, 0x1
 	str r0, [r6]
-	b _08005B90
-_08005B6C:
+	b @08005B90
+@08005B6C:
 	ldr r0, [r6]
 	ldrb r3, [r0]
 	adds r0, 0x1
@@ -2933,75 +2933,75 @@ _08005B6C:
 	strb r0, [r1]
 	ldrb r3, [r6, 0xA]
 	adds r0, r3
-	b _08005C6A
+	b @08005C6A
 	.align 2, 0
 	.pool
-_08005B90:
+@08005B90:
 	ldr r0, [r4]
 	lsls r0, 28
 	lsrs r0, 28
 	cmp r0, 0x8
-	bhi _08005C10
+	bhi @08005C10
 	lsls r0, 2
-	ldr r1, =_08005BA8
+	ldr r1, =@08005BA8
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08005BA8:
-	.4byte _08005BCC
-	.4byte _08005BDA
-	.4byte _08005BE8
-	.4byte _08005BE8
-	.4byte _08005BE8
-	.4byte _08005BE8
-	.4byte _08005C10
-	.4byte _08005BF6
-	.4byte _08005C04
-_08005BCC:
+@08005BA8:
+	.4byte @08005BCC
+	.4byte @08005BDA
+	.4byte @08005BE8
+	.4byte @08005BE8
+	.4byte @08005BE8
+	.4byte @08005BE8
+	.4byte @08005C10
+	.4byte @08005BF6
+	.4byte @08005C04
+@08005BCC:
 	adds r0, r6, 0
 	adds r0, 0x21
 	ldrb r1, [r0]
 	adds r0, r3, 0
 	bl DecompressGlyphFont0
-	b _08005C10
-_08005BDA:
+	b @08005C10
+@08005BDA:
 	adds r0, r6, 0
 	adds r0, 0x21
 	ldrb r1, [r0]
 	adds r0, r3, 0
 	bl DecompressGlyphFont1
-	b _08005C10
-_08005BE8:
+	b @08005C10
+@08005BE8:
 	adds r0, r6, 0
 	adds r0, 0x21
 	ldrb r1, [r0]
 	adds r0, r3, 0
 	bl DecompressGlyphFont2
-	b _08005C10
-_08005BF6:
+	b @08005C10
+@08005BF6:
 	adds r0, r6, 0
 	adds r0, 0x21
 	ldrb r1, [r0]
 	adds r0, r3, 0
 	bl DecompressGlyphFont7
-	b _08005C10
-_08005C04:
+	b @08005C10
+@08005C04:
 	adds r0, r6, 0
 	adds r0, 0x21
 	ldrb r1, [r0]
 	adds r0, r3, 0
 	bl DecompressGlyphFont8
-_08005C10:
+@08005C10:
 	adds r0, r6, 0
 	bl CopyGlyphToWindow
 	adds r2, r6, 0
 	adds r2, 0x20
 	ldrb r0, [r2]
 	cmp r0, 0
-	beq _08005C48
+	beq @08005C48
 	ldr r1, =0x03002f90
 	adds r1, 0x80
 	ldrb r0, [r1]
@@ -3012,64 +3012,64 @@ _08005C10:
 	ldrb r0, [r1]
 	subs r4, r2, r0
 	cmp r4, 0
-	ble _08005C70
+	ble @08005C70
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl Text_ClearHorizontalSpan
 	ldrb r0, [r6, 0x8]
 	adds r0, r4
-	b _08005C6E
+	b @08005C6E
 	.align 2, 0
 	.pool
-_08005C48:
+@08005C48:
 	adds r0, r6, 0
 	adds r0, 0x21
 	ldrb r0, [r0]
 	cmp r0, 0
-	beq _08005C64
+	beq @08005C64
 	ldr r0, =0x03002f90
 	adds r0, 0x80
 	ldrb r1, [r6, 0xA]
 	ldrb r0, [r0]
 	adds r1, r0
 	ldrb r0, [r6, 0x8]
-	b _08005C6C
+	b @08005C6C
 	.align 2, 0
 	.pool
-_08005C64:
+@08005C64:
 	ldr r0, =0x03002f90
 	adds r0, 0x80
 	ldrb r0, [r0]
-_08005C6A:
+@08005C6A:
 	ldrb r1, [r6, 0x8]
-_08005C6C:
+@08005C6C:
 	adds r0, r1
-_08005C6E:
+@08005C6E:
 	strb r0, [r6, 0x8]
-_08005C70:
+@08005C70:
 	movs r0, 0
-	b _08005D6E
+	b @08005D6E
 	.align 2, 0
 	.pool
-_08005C78:
+@08005C78:
 	adds r0, r6, 0
 	bl remo_is_it_time_to_continue
 	lsls r0, 16
 	cmp r0, 0
-	bne _08005C86
-	b _08005B56
-_08005C86:
+	bne @08005C86
+	b @08005B56
+@08005C86:
 	movs r0, 0
 	strb r0, [r6, 0x1C]
-	b _08005B56
-_08005C8C:
+	b @08005B56
+@08005C8C:
 	adds r0, r6, 0
 	bl remo_is_it_time_to_continue_plus_down_arrow
 	lsls r0, 16
 	cmp r0, 0
-	bne _08005C9A
-	b _08005B56
-_08005C9A:
+	bne @08005C9A
+	b @08005B56
+@08005C9A:
 	ldrb r0, [r6, 0x4]
 	ldrb r2, [r6, 0xD]
 	lsls r2, 28
@@ -3083,15 +3083,15 @@ _08005C9A:
 	ldrb r0, [r6, 0x7]
 	strb r0, [r6, 0x9]
 	strb r1, [r6, 0x1C]
-	b _08005B56
-_08005CB8:
+	b @08005B56
+@08005CB8:
 	adds r0, r6, 0
 	bl remo_is_it_time_to_continue_plus_down_arrow
 	lsls r0, 16
 	cmp r0, 0
-	bne _08005CC6
-	b _08005B56
-_08005CC6:
+	bne @08005CC6
+	b @08005B56
+@08005CC6:
 	adds r0, r6, 0
 	bl remo_clear_down_arrow
 	ldrb r1, [r6, 0x5]
@@ -3109,20 +3109,20 @@ _08005CC6:
 	strb r0, [r6, 0x8]
 	movs r0, 0x4
 	strb r0, [r6, 0x1C]
-	b _08005B56
+	b @08005B56
 	.align 2, 0
 	.pool
-_08005CF0:
+@08005CF0:
 	ldrb r0, [r6, 0x1F]
 	cmp r0, 0
-	beq _08005D44
+	beq @08005D44
 	bl sub_8197964
 	ldr r1, =gWindowVerticalScrollSpeeds
 	adds r0, r1
 	ldrb r4, [r0]
 	ldrb r2, [r6, 0x1F]
 	cmp r2, r4
-	bge _08005D20
+	bge @08005D20
 	ldrb r0, [r6, 0x4]
 	ldrb r1, [r6, 0xD]
 	lsls r1, 28
@@ -3132,10 +3132,10 @@ _08005CF0:
 	movs r1, 0
 	bl Window_ScrollVertically
 	movs r0, 0
-	b _08005D38
+	b @08005D38
 	.align 2, 0
 	.pool
-_08005D20:
+@08005D20:
 	ldrb r0, [r6, 0x4]
 	ldrb r1, [r6, 0xD]
 	lsls r1, 28
@@ -3147,46 +3147,46 @@ _08005D20:
 	bl Window_ScrollVertically
 	ldrb r0, [r6, 0x1F]
 	subs r0, r4
-_08005D38:
+@08005D38:
 	strb r0, [r6, 0x1F]
 	ldrb r0, [r6, 0x4]
 	movs r1, 0x2
 	bl Window_CopyToVram
-	b _08005B56
-_08005D44:
+	b @08005B56
+@08005D44:
 	strb r0, [r6, 0x1C]
-	b _08005B56
-_08005D48:
+	b @08005B56
+@08005D48:
 	bl mplay_has_finished_maybe
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
-	beq _08005D56
-	b _08005B56
-_08005D56:
+	beq @08005D56
+	b @08005B56
+@08005D56:
 	strb r0, [r6, 0x1C]
-	b _08005B56
-_08005D5A:
+	b @08005B56
+@08005D5A:
 	ldrb r0, [r6, 0x1E]
 	adds r1, r0, 0
 	cmp r1, 0
-	beq _08005D68
+	beq @08005D68
 	subs r0, 0x1
 	strb r0, [r6, 0x1E]
-	b _08005B56
-_08005D68:
+	b @08005B56
+@08005D68:
 	strb r1, [r6, 0x1C]
-	b _08005B56
-_08005D6C:
+	b @08005B56
+@08005D6C:
 	movs r0, 0x1
-_08005D6E:
+@08005D6E:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
 	thumb_func_end font_render_b
 
 	thumb_func_start sub_8005D74
-sub_8005D74: @ 8005D74
+sub_8005D74: ; 8005D74
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3199,42 +3199,42 @@ sub_8005D74: @ 8005D74
 	movs r2, 0
 	mov r1, sp
 	adds r1, 0x7
-_08005D8C:
+@08005D8C:
 	strb r2, [r1]
 	subs r1, 0x1
 	cmp r1, sp
-	bge _08005D8C
+	bge @08005D8C
 	movs r5, 0
 	movs r6, 0
 	adds r4, r0, 0
 	movs r2, 0
-_08005D9C:
+@08005D9C:
 	adds r0, r4, r2
 	ldrb r3, [r0]
 	adds r2, 0x1
 	adds r0, r3, 0
 	subs r0, 0xF7
 	cmp r0, 0x8
-	bhi _08005E6A
+	bhi @08005E6A
 	lsls r0, 2
-	ldr r1, =_08005DB8
+	ldr r1, =@08005DB8
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08005DB8:
-	.4byte _08005E64
-	.4byte _08005E68
-	.4byte _08005E68
-	.4byte _08005E70
-	.4byte _08005E70
-	.4byte _08005DEC
-	.4byte _08005E64
-	.4byte _08005DDC
-	.4byte _08005DDC
-_08005DDC:
+@08005DB8:
+	.4byte @08005E64
+	.4byte @08005E68
+	.4byte @08005E68
+	.4byte @08005E70
+	.4byte @08005E70
+	.4byte @08005DEC
+	.4byte @08005E64
+	.4byte @08005DDC
+	.4byte @08005DDC
+@08005DDC:
 	mov r1, sp
 	adds r0, r1, r6
 	strb r5, [r0]
@@ -3242,74 +3242,74 @@ _08005DDC:
 	adds r0, r6, 0x1
 	lsls r0, 24
 	lsrs r6, r0, 24
-	b _08005E70
-_08005DEC:
+	b @08005E70
+@08005DEC:
 	adds r0, r4, r2
 	ldrb r0, [r0]
 	adds r2, 0x1
 	subs r0, 0x1
 	cmp r0, 0x15
-	bhi _08005E70
+	bhi @08005E70
 	lsls r0, 2
-	ldr r1, =_08005E08
+	ldr r1, =@08005E08
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08005E08:
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E60
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E70
-	.4byte _08005E64
-	.4byte _08005E70
-	.4byte _08005E70
-	.4byte _08005E62
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E70
-	.4byte _08005E62
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E64
-	.4byte _08005E70
-	.4byte _08005E70
-_08005E60:
+@08005E08:
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E60
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E70
+	.4byte @08005E64
+	.4byte @08005E70
+	.4byte @08005E70
+	.4byte @08005E62
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E70
+	.4byte @08005E62
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E64
+	.4byte @08005E70
+	.4byte @08005E70
+@08005E60:
 	adds r2, 0x1
-_08005E62:
+@08005E62:
 	adds r2, 0x1
-_08005E64:
+@08005E64:
 	adds r2, 0x1
-	b _08005E70
-_08005E68:
+	b @08005E70
+@08005E68:
 	adds r2, 0x1
-_08005E6A:
+@08005E6A:
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
-_08005E70:
+@08005E70:
 	cmp r3, 0xFF
-	bne _08005D9C
+	bne @08005D9C
 	movs r5, 0
 	movs r2, 0
-_08005E78:
+@08005E78:
 	mov r1, sp
 	adds r0, r1, r2
 	ldrb r1, [r0]
 	cmp r5, r1
-	bcs _08005E84
+	bcs @08005E84
 	ldrb r5, [r0]
-_08005E84:
+@08005E84:
 	adds r2, 0x1
 	cmp r2, 0x7
-	ble _08005E78
+	ble @08005E78
 	adds r0, r7, 0
 	movs r1, 0
 	bl fbox_get_field
@@ -3326,7 +3326,7 @@ _08005E84:
 	thumb_func_end sub_8005D74
 
 	thumb_func_start GetFontWidthFunc
-GetFontWidthFunc: @ 8005EA8
+GetFontWidthFunc: ; 8005EA8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3334,30 +3334,30 @@ GetFontWidthFunc: @ 8005EA8
 	ldr r0, =gGlyphWidthFuncs
 	adds r2, r0, 0x4
 	adds r1, r0, 0
-_08005EB6:
+@08005EB6:
 	ldr r0, [r1]
 	cmp r4, r0
-	bne _08005EC4
+	bne @08005EC4
 	ldr r0, [r2]
-	b _08005ED0
+	b @08005ED0
 	.align 2, 0
 	.pool
-_08005EC4:
+@08005EC4:
 	adds r2, 0x8
 	adds r1, 0x8
 	adds r3, 0x1
 	cmp r3, 0x8
-	bls _08005EB6
+	bls @08005EB6
 	movs r0, 0
-_08005ED0:
+@08005ED0:
 	pop {r4}
 	pop {r1}
 	bx r1
 	thumb_func_end GetFontWidthFunc
 
 	thumb_func_start font_get_width_of_string
-@ unsigned int font_get_width_of_string(u8 a1, u8 *s, u16 a3)
-font_get_width_of_string: @ 8005ED8
+; unsigned int font_get_width_of_string(u8 a1, u8 *s, u16 a3)
+font_get_width_of_string: ; 8005ED8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3377,231 +3377,231 @@ font_get_width_of_string: @ 8005ED8
 	bl GetFontWidthFunc
 	mov r8, r0
 	cmp r0, 0
-	bne _08005F06
-_08005F02:
+	bne @08005F06
+@08005F02:
 	movs r0, 0
-	b _0800612E
-_08005F06:
+	b @0800612E
+@08005F06:
 	lsls r0, r5, 16
 	asrs r2, r0, 16
 	movs r1, 0x1
 	negs r1, r1
 	str r0, [sp, 0x4]
 	cmp r2, r1
-	bne _08005F24
+	bne @08005F24
 	adds r0, r6, 0
 	movs r1, 0x2
 	bl fbox_get_field
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
-	b _08005F26
-_08005F24:
+	b @08005F26
+@08005F24:
 	mov r10, r2
-_08005F26:
+@08005F26:
 	movs r2, 0
 	str r2, [sp]
 	movs r5, 0
 	movs r6, 0
-	b _0800611E
-_08005F30:
+	b @0800611E
+@08005F30:
 	ldrb r1, [r4]
 	adds r0, r1, 0
 	subs r0, 0xF7
 	cmp r0, 0x7
-	bls _08005F3C
-	b _080060F8
-_08005F3C:
+	bls @08005F3C
+	b @080060F8
+@08005F3C:
 	lsls r0, 2
-	ldr r1, =_08005F4C
+	ldr r1, =@08005F4C
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08005F4C:
-	.4byte _08005FA2
-	.4byte _080060BC
-	.4byte _080060BC
-	.4byte _0800611C
-	.4byte _0800611C
-	.4byte _08005FEA
-	.4byte _08005F78
-	.4byte _08005F6C
-_08005F6C:
+@08005F4C:
+	.4byte @08005FA2
+	.4byte @080060BC
+	.4byte @080060BC
+	.4byte @0800611C
+	.4byte @0800611C
+	.4byte @08005FEA
+	.4byte @08005F78
+	.4byte @08005F6C
+@08005F6C:
 	ldr r0, [sp]
 	cmp r5, r0
-	bls _08005F74
+	bls @08005F74
 	str r5, [sp]
-_08005F74:
+@08005F74:
 	movs r5, 0
-	b _0800611C
-_08005F78:
+	b @0800611C
+@08005F78:
 	adds r4, 0x1
 	ldrb r0, [r4]
 	cmp r0, 0x3
-	beq _08005F98
+	beq @08005F98
 	cmp r0, 0x3
-	bgt _08005F8A
+	bgt @08005F8A
 	cmp r0, 0x2
-	beq _08005F90
-	b _08005F02
-_08005F8A:
+	beq @08005F90
+	b @08005F02
+@08005F8A:
 	cmp r0, 0x4
-	beq _08005FA0
-	b _08005F02
-_08005F90:
+	beq @08005FA0
+	b @08005F02
+@08005F90:
 	ldr r6, =0x02021cc4
-	b _08005FA2
+	b @08005FA2
 	.align 2, 0
 	.pool
-_08005F98:
+@08005F98:
 	ldr r6, =0x02021dc4
-	b _08005FA2
+	b @08005FA2
 	.align 2, 0
 	.pool
-_08005FA0:
+@08005FA0:
 	ldr r6, =0x02021ec4
-_08005FA2:
+@08005FA2:
 	cmp r6, 0
-	bne _08005FE0
+	bne @08005FE0
 	adds r4, 0x1
 	ldrb r0, [r4]
 	bl sub_81AFC74
 	adds r6, r0, 0
-	b _08005FE0
+	b @08005FE0
 	.align 2, 0
 	.pool
-_08005FB8:
+@08005FB8:
 	ldrb r0, [r6]
 	adds r6, 0x1
 	mov r1, r9
 	bl _call_via_r8
 	cmp r7, 0
-	ble _08005FD0
+	ble @08005FD0
 	cmp r0, r7
-	bge _08005FCC
+	bge @08005FCC
 	adds r0, r7, 0
-_08005FCC:
+@08005FCC:
 	adds r5, r0
-	b _08005FE0
-_08005FD0:
+	b @08005FE0
+@08005FD0:
 	adds r5, r0
 	mov r2, r9
 	cmp r2, 0
-	beq _08005FE0
+	beq @08005FE0
 	ldrb r0, [r4, 0x1]
 	cmp r0, 0xFF
-	beq _08005FE0
+	beq @08005FE0
 	add r5, r10
-_08005FE0:
+@08005FE0:
 	ldrb r0, [r6]
 	cmp r0, 0xFF
-	bne _08005FB8
+	bne @08005FB8
 	movs r6, 0
-	b _0800611C
-_08005FEA:
+	b @0800611C
+@08005FEA:
 	adds r4, 0x1
 	ldrb r0, [r4]
 	subs r0, 0x1
 	cmp r0, 0x15
-	bls _08005FF6
-	b _0800611C
-_08005FF6:
+	bls @08005FF6
+	b @0800611C
+@08005FF6:
 	lsls r0, 2
-	ldr r1, =_08006004
+	ldr r1, =@08006004
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08006004:
-	.4byte _08006060
-	.4byte _08006060
-	.4byte _08006060
-	.4byte _0800605C
-	.4byte _08006060
-	.4byte _08006064
-	.4byte _0800611C
-	.4byte _08006060
-	.4byte _0800611C
-	.4byte _0800611C
-	.4byte _0800605E
-	.4byte _08006060
-	.4byte _08006060
-	.4byte _08006060
-	.4byte _0800611C
-	.4byte _0800605E
-	.4byte _08006090
-	.4byte _08006098
-	.4byte _0800609E
-	.4byte _080060AA
-	.4byte _080060B0
-	.4byte _080060B6
-_0800605C:
+@08006004:
+	.4byte @08006060
+	.4byte @08006060
+	.4byte @08006060
+	.4byte @0800605C
+	.4byte @08006060
+	.4byte @08006064
+	.4byte @0800611C
+	.4byte @08006060
+	.4byte @0800611C
+	.4byte @0800611C
+	.4byte @0800605E
+	.4byte @08006060
+	.4byte @08006060
+	.4byte @08006060
+	.4byte @0800611C
+	.4byte @0800605E
+	.4byte @08006090
+	.4byte @08006098
+	.4byte @0800609E
+	.4byte @080060AA
+	.4byte @080060B0
+	.4byte @080060B6
+@0800605C:
 	adds r4, 0x1
-_0800605E:
+@0800605E:
 	adds r4, 0x1
-_08006060:
+@08006060:
 	adds r4, 0x1
-	b _0800611C
-_08006064:
+	b @0800611C
+@08006064:
 	adds r4, 0x1
 	ldrb r0, [r4]
 	bl GetFontWidthFunc
 	mov r8, r0
 	cmp r0, 0
-	bne _08006074
-	b _08005F02
-_08006074:
+	bne @08006074
+	b @08005F02
+@08006074:
 	ldr r0, [sp, 0x4]
 	asrs r1, r0, 16
 	movs r0, 0x1
 	negs r0, r0
 	cmp r1, r0
-	bne _0800611C
+	bne @0800611C
 	ldrb r0, [r4]
 	movs r1, 0x2
 	bl fbox_get_field
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
-	b _0800611C
-_08006090:
+	b @0800611C
+@08006090:
 	adds r4, 0x1
 	ldrb r0, [r4]
-_08006094:
+@08006094:
 	adds r5, r0
-	b _0800611C
-_08006098:
+	b @0800611C
+@08006098:
 	adds r4, 0x1
 	ldrb r5, [r4]
-	b _0800611C
-_0800609E:
+	b @0800611C
+@0800609E:
 	adds r4, 0x1
 	ldrb r0, [r4]
 	cmp r0, r5
-	bls _0800611C
+	bls @0800611C
 	adds r5, r0, 0
-	b _0800611C
-_080060AA:
+	b @0800611C
+@080060AA:
 	adds r4, 0x1
 	ldrb r7, [r4]
-	b _0800611C
-_080060B0:
+	b @0800611C
+@080060B0:
 	movs r2, 0x1
 	mov r9, r2
-	b _0800611C
-_080060B6:
+	b @0800611C
+@080060B6:
 	movs r0, 0
 	mov r9, r0
-	b _0800611C
-_080060BC:
+	b @0800611C
+@080060BC:
 	ldrb r0, [r4]
 	cmp r0, 0xF9
-	bne _080060D6
+	bne @080060D6
 	adds r4, 0x1
 	ldrb r0, [r4]
 	movs r2, 0x80
@@ -3610,59 +3610,59 @@ _080060BC:
 	orrs r0, r1
 	mov r1, r9
 	bl _call_via_r8
-	b _080060E2
-_080060D6:
+	b @080060E2
+@080060D6:
 	adds r4, 0x1
 	ldrb r0, [r4]
 	bl Font_ReturnsValueFromLUT
 	lsls r0, 24
 	lsrs r0, 24
-_080060E2:
+@080060E2:
 	cmp r7, 0
-	ble _080060EE
+	ble @080060EE
 	cmp r0, r7
-	bge _08006094
+	bge @08006094
 	adds r0, r7, 0
-	b _08006094
-_080060EE:
+	b @08006094
+@080060EE:
 	adds r5, r0
 	mov r0, r9
 	cmp r0, 0
-	beq _0800611C
-	b _08006114
-_080060F8:
+	beq @0800611C
+	b @08006114
+@080060F8:
 	adds r0, r1, 0
 	mov r1, r9
 	bl _call_via_r8
 	cmp r7, 0
-	ble _0800610C
+	ble @0800610C
 	cmp r0, r7
-	bge _08006094
+	bge @08006094
 	adds r0, r7, 0
-	b _08006094
-_0800610C:
+	b @08006094
+@0800610C:
 	adds r5, r0
 	mov r2, r9
 	cmp r2, 0
-	beq _0800611C
-_08006114:
+	beq @0800611C
+@08006114:
 	ldrb r0, [r4, 0x1]
 	cmp r0, 0xFF
-	beq _0800611C
+	beq @0800611C
 	add r5, r10
-_0800611C:
+@0800611C:
 	adds r4, 0x1
-_0800611E:
+@0800611E:
 	ldrb r0, [r4]
 	cmp r0, 0xFF
-	beq _08006126
-	b _08005F30
-_08006126:
+	beq @08006126
+	b @08005F30
+@08006126:
 	ldr r0, [sp]
 	cmp r5, r0
-	bls _0800612E
+	bls @0800612E
 	adds r0, r5, 0
-_0800612E:
+@0800612E:
 	add sp, 0x8
 	pop {r3-r5}
 	mov r8, r3
@@ -3674,8 +3674,8 @@ _0800612E:
 	thumb_func_end font_get_width_of_string
 
 	thumb_func_start font_render_some
-@ int font_render_some(char *pixels, u8 font, int a3)
-font_render_some: @ 8006140
+; int font_render_some(char *pixels, u8 font, int a3)
+font_render_some: ; 8006140
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -3707,71 +3707,71 @@ font_render_some: @ 8006140
 	bl GenerateFontHalfRowLut
 	adds r7, r6, 0
 	movs r6, 0
-_08006182:
+@08006182:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	mov r8, r0
 	adds r6, 0x1
 	subs r0, 0xF7
 	cmp r0, 0x8
-	bhi _0800627E
+	bhi @0800627E
 	lsls r0, 2
-	ldr r1, =_080061A0
+	ldr r1, =@080061A0
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_080061A0:
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _080062B8
-	.4byte _080062B8
-	.4byte _080061C4
-	.4byte _08006276
-	.4byte _080062B8
-	.4byte _080062B8
-_080061C4:
+@080061A0:
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @080062B8
+	.4byte @080062B8
+	.4byte @080061C4
+	.4byte @08006276
+	.4byte @080062B8
+	.4byte @080062B8
+@080061C4:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	adds r6, 0x1
 	subs r0, 0x1
 	cmp r0, 0x15
-	bhi _080062B8
+	bhi @080062B8
 	lsls r0, 2
-	ldr r1, =_080061E0
+	ldr r1, =@080061E0
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_080061E0:
-	.4byte _0800624A
-	.4byte _08006254
-	.4byte _0800625C
-	.4byte _08006238
-	.4byte _08006276
-	.4byte _08006270
-	.4byte _080062B8
-	.4byte _08006276
-	.4byte _080062B8
-	.4byte _080062B8
-	.4byte _0800627A
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _080062B8
-	.4byte _0800627A
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _08006276
-	.4byte _080062B8
-	.4byte _080062B8
-_08006238:
+@080061E0:
+	.4byte @0800624A
+	.4byte @08006254
+	.4byte @0800625C
+	.4byte @08006238
+	.4byte @08006276
+	.4byte @08006270
+	.4byte @080062B8
+	.4byte @08006276
+	.4byte @080062B8
+	.4byte @080062B8
+	.4byte @0800627A
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @080062B8
+	.4byte @0800627A
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @08006276
+	.4byte @080062B8
+	.4byte @080062B8
+@08006238:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	str r0, [sp, 0x8]
@@ -3780,54 +3780,54 @@ _08006238:
 	ldrb r0, [r0]
 	str r0, [sp, 0xC]
 	adds r6, 0x1
-	b _0800625C
-_0800624A:
+	b @0800625C
+@0800624A:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	str r0, [sp, 0x8]
 	adds r6, 0x1
-	b _08006266
-_08006254:
+	b @08006266
+@08006254:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	str r0, [sp, 0xC]
-	b _08006262
-_0800625C:
+	b @08006262
+@0800625C:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	mov r10, r0
-_08006262:
+@08006262:
 	adds r6, 0x1
 	ldr r0, [sp, 0x8]
-_08006266:
+@08006266:
 	ldr r1, [sp, 0xC]
 	mov r2, r10
 	bl GenerateFontHalfRowLut
-	b _080062B8
-_08006270:
+	b @080062B8
+@08006270:
 	adds r0, r7, r6
 	ldrb r0, [r0]
 	str r0, [sp, 0x4]
-_08006276:
+@08006276:
 	adds r6, 0x1
-	b _080062B8
-_0800627A:
+	b @080062B8
+@0800627A:
 	adds r6, 0x1
-	b _08006276
-_0800627E:
+	b @08006276
+@0800627E:
 	ldr r0, [sp, 0x4]
 	cmp r0, 0x1
-	beq _08006290
+	beq @08006290
 	cmp r0, 0x9
-	bne _08006290
+	bne @08006290
 	mov r0, r8
 	bl DecompressGlyphFont9
-	b _08006298
-_08006290:
+	b @08006298
+@08006290:
 	mov r0, r8
 	movs r1, 0x1
 	bl DecompressGlyphFont1
-_08006298:
+@08006298:
 	ldr r4, =0x03002f90
 	ldr r5, =0x04000008
 	adds r0, r4, 0
@@ -3842,12 +3842,12 @@ _08006298:
 	bl CpuSet
 	movs r0, 0x40
 	add r9, r0
-_080062B8:
+@080062B8:
 	mov r0, r8
 	cmp r0, 0xFF
-	beq _080062C0
-	b _08006182
-_080062C0:
+	beq @080062C0
+	b @08006182
+@080062C0:
 	mov r0, sp
 	mov r1, sp
 	adds r1, 0x1
@@ -3868,7 +3868,7 @@ _080062C0:
 	thumb_func_end font_render_some
 
 	thumb_func_start TextBox_DrawKeypadIcon
-TextBox_DrawKeypadIcon: @ 80062E8
+TextBox_DrawKeypadIcon: ; 80062E8
 	push {r4,r5,lr}
 	sub sp, 0x18
 	lsls r0, 24
@@ -3908,7 +3908,7 @@ TextBox_DrawKeypadIcon: @ 80062E8
 	thumb_func_end TextBox_DrawKeypadIcon
 
 	thumb_func_start sub_8006338
-sub_8006338: @ 8006338
+sub_8006338: ; 8006338
 	lsls r0, 24
 	ldr r1, =gKeypadIcons
 	lsrs r0, 22
@@ -3920,7 +3920,7 @@ sub_8006338: @ 8006338
 	thumb_func_end sub_8006338
 
 	thumb_func_start Font_ReturnsValueFromLUT
-Font_ReturnsValueFromLUT: @ 8006348
+Font_ReturnsValueFromLUT: ; 8006348
 	lsls r0, 24
 	ldr r1, =gKeypadIcons
 	lsrs r0, 22
@@ -3932,7 +3932,7 @@ Font_ReturnsValueFromLUT: @ 8006348
 	thumb_func_end Font_ReturnsValueFromLUT
 
 	thumb_func_start sub_8006358
-sub_8006358: @ 8006358
+sub_8006358: ; 8006358
 	lsls r0, 24
 	ldr r1, =gKeypadIcons
 	lsrs r0, 22
@@ -3944,7 +3944,7 @@ sub_8006358: @ 8006358
 	thumb_func_end sub_8006358
 
 	thumb_func_start fboxes_set_default_ptr
-fboxes_set_default_ptr: @ 8006368
+fboxes_set_default_ptr: ; 8006368
 	push {lr}
 	ldr r0, =gFontInfos
 	bl fboxes_set_ptr
@@ -3955,7 +3955,7 @@ fboxes_set_default_ptr: @ 8006368
 	thumb_func_end fboxes_set_default_ptr
 
 	thumb_func_start fbox_get_field
-fbox_get_field: @ 8006378
+fbox_get_field: ; 8006378
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
@@ -3963,107 +3963,107 @@ fbox_get_field: @ 8006378
 	lsrs r1, 24
 	movs r0, 0
 	cmp r1, 0x7
-	bhi _08006456
+	bhi @08006456
 	lsls r0, r1, 2
-	ldr r1, =_08006398
+	ldr r1, =@08006398
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08006398:
-	.4byte _080063B8
-	.4byte _080063CC
-	.4byte _080063E0
-	.4byte _080063F4
-	.4byte _08006408
-	.4byte _0800641C
-	.4byte _08006430
-	.4byte _08006448
-_080063B8:
+@08006398:
+	.4byte @080063B8
+	.4byte @080063CC
+	.4byte @080063E0
+	.4byte @080063F4
+	.4byte @08006408
+	.4byte @0800641C
+	.4byte @08006430
+	.4byte @08006448
+@080063B8:
 	ldr r1, =gFontInfos
 	lsls r0, r2, 1
 	adds r0, r2
 	lsls r0, 2
 	adds r0, r1
 	ldrb r0, [r0, 0x4]
-	b _08006456
+	b @08006456
 	.align 2, 0
 	.pool
-_080063CC:
+@080063CC:
 	ldr r1, =gFontInfos
 	lsls r0, r2, 1
 	adds r0, r2
 	lsls r0, 2
 	adds r0, r1
 	ldrb r0, [r0, 0x5]
-	b _08006456
+	b @08006456
 	.align 2, 0
 	.pool
-_080063E0:
+@080063E0:
 	ldr r1, =gFontInfos
 	lsls r0, r2, 1
 	adds r0, r2
 	lsls r0, 2
 	adds r0, r1
 	ldrb r0, [r0, 0x6]
-	b _08006456
+	b @08006456
 	.align 2, 0
 	.pool
-_080063F4:
+@080063F4:
 	ldr r1, =gFontInfos
 	lsls r0, r2, 1
 	adds r0, r2
 	lsls r0, 2
 	adds r0, r1
 	ldrb r0, [r0, 0x7]
-	b _08006456
+	b @08006456
 	.align 2, 0
 	.pool
-_08006408:
+@08006408:
 	ldr r0, =gFontInfos
 	lsls r1, r2, 1
 	adds r1, r2
 	lsls r1, 2
 	adds r1, r0
 	ldrb r0, [r1, 0x8]
-	b _0800643C
+	b @0800643C
 	.align 2, 0
 	.pool
-_0800641C:
+@0800641C:
 	ldr r0, =gFontInfos
 	lsls r1, r2, 1
 	adds r1, r2
 	lsls r1, 2
 	adds r1, r0
 	ldrb r0, [r1, 0x8]
-	b _08006454
+	b @08006454
 	.align 2, 0
 	.pool
-_08006430:
+@08006430:
 	ldr r0, =gFontInfos
 	lsls r1, r2, 1
 	adds r1, r2
 	lsls r1, 2
 	adds r1, r0
 	ldrb r0, [r1, 0x9]
-_0800643C:
+@0800643C:
 	lsls r0, 28
 	lsrs r0, 28
-	b _08006456
+	b @08006456
 	.align 2, 0
 	.pool
-_08006448:
+@08006448:
 	ldr r0, =gFontInfos
 	lsls r1, r2, 1
 	adds r1, r2
 	lsls r1, 2
 	adds r1, r0
 	ldrb r0, [r1, 0x9]
-_08006454:
+@08006454:
 	lsrs r0, 4
-_08006456:
+@08006456:
 	pop {r1}
 	bx r1
 	.align 2, 0
@@ -4071,8 +4071,8 @@ _08006456:
 	thumb_func_end fbox_get_field
 
 	thumb_func_start GetMenuCursorDimensionByFont
-@ u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
-GetMenuCursorDimensionByFont: @ 8006460
+; u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension)
+GetMenuCursorDimensionByFont: ; 8006460
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -4087,12 +4087,12 @@ GetMenuCursorDimensionByFont: @ 8006460
 	thumb_func_end GetMenuCursorDimensionByFont
 
 	thumb_func_start DecompressGlyphFont0
-DecompressGlyphFont0: @ 8006478
+DecompressGlyphFont0: ; 8006478
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
 	cmp r1, 0x1
-	bne _080064C4
+	bne @080064C4
 	lsrs r2, r0, 20
 	lsls r2, 9
 	movs r0, 0xF
@@ -4118,10 +4118,10 @@ DecompressGlyphFont0: @ 8006478
 	adds r4, 0x81
 	movs r0, 0xC
 	strb r0, [r4]
-	b _08006534
+	b @08006534
 	.align 2, 0
 	.pool
-_080064C4:
+@080064C4:
 	lsls r1, r3, 6
 	ldr r0, =gFont0LatinGlyphs
 	adds r5, r1, r0
@@ -4133,7 +4133,7 @@ _080064C4:
 	adds r0, 0x80
 	strb r1, [r0]
 	cmp r1, 0x8
-	bhi _08006500
+	bhi @08006500
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4142,10 +4142,10 @@ _080064C4:
 	adds r1, r4, 0
 	adds r1, 0x40
 	bl DecompressGlyphTile
-	b _0800652C
+	b @0800652C
 	.align 2, 0
 	.pool
-_08006500:
+@08006500:
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4164,12 +4164,12 @@ _08006500:
 	adds r1, r4, 0
 	adds r1, 0x60
 	bl DecompressGlyphTile
-_0800652C:
+@0800652C:
 	ldr r0, =0x03002f90
 	adds r0, 0x81
 	movs r1, 0xD
 	strb r1, [r0]
-_08006534:
+@08006534:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -4178,32 +4178,32 @@ _08006534:
 	thumb_func_end DecompressGlyphFont0
 
 	thumb_func_start GetGlyphWidthFont0
-GetGlyphWidthFont0: @ 8006540
+GetGlyphWidthFont0: ; 8006540
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r1, 0x1
-	beq _08006558
+	beq @08006558
 	ldr r0, =gFont0LatinGlyphWidths
 	adds r0, r2, r0
 	ldrb r0, [r0]
-	b _0800655A
+	b @0800655A
 	.align 2, 0
 	.pool
-_08006558:
+@08006558:
 	movs r0, 0x8
-_0800655A:
+@0800655A:
 	pop {r1}
 	bx r1
 	thumb_func_end GetGlyphWidthFont0
 
 	thumb_func_start DecompressGlyphFont7
-DecompressGlyphFont7: @ 8006560
+DecompressGlyphFont7: ; 8006560
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
 	cmp r1, 0x1
-	bne _080065AC
+	bne @080065AC
 	lsrs r2, r0, 20
 	lsls r2, 9
 	movs r5, 0xF
@@ -4229,10 +4229,10 @@ DecompressGlyphFont7: @ 8006560
 	strb r0, [r1]
 	adds r4, 0x81
 	strb r5, [r4]
-	b _0800661C
+	b @0800661C
 	.align 2, 0
 	.pool
-_080065AC:
+@080065AC:
 	lsls r1, r3, 6
 	ldr r0, =gFont7LatinGlyphs
 	adds r6, r1, r0
@@ -4244,7 +4244,7 @@ _080065AC:
 	adds r0, 0x80
 	strb r1, [r0]
 	cmp r1, 0x8
-	bhi _080065E8
+	bhi @080065E8
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4253,10 +4253,10 @@ _080065AC:
 	adds r1, r4, 0
 	adds r1, 0x40
 	bl DecompressGlyphTile
-	b _08006614
+	b @08006614
 	.align 2, 0
 	.pool
-_080065E8:
+@080065E8:
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4275,12 +4275,12 @@ _080065E8:
 	adds r1, r4, 0
 	adds r1, 0x60
 	bl DecompressGlyphTile
-_08006614:
+@08006614:
 	ldr r0, =0x03002f90
 	adds r0, 0x81
 	movs r1, 0xF
 	strb r1, [r0]
-_0800661C:
+@0800661C:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -4289,33 +4289,33 @@ _0800661C:
 	thumb_func_end DecompressGlyphFont7
 
 	thumb_func_start GetGlyphWidthFont7
-GetGlyphWidthFont7: @ 8006628
+GetGlyphWidthFont7: ; 8006628
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r1, 0x1
-	beq _08006640
+	beq @08006640
 	ldr r0, =gFont7LatinGlyphWidths
 	adds r0, r2, r0
 	ldrb r0, [r0]
-	b _08006642
+	b @08006642
 	.align 2, 0
 	.pool
-_08006640:
+@08006640:
 	movs r0, 0x8
-_08006642:
+@08006642:
 	pop {r1}
 	bx r1
 	thumb_func_end GetGlyphWidthFont7
 
 	thumb_func_start DecompressGlyphFont8
-@ void DecompressGlyphFont8(u16 glyphIndex, bool japanese)
-DecompressGlyphFont8: @ 8006648
+; void DecompressGlyphFont8(u16 glyphIndex, bool japanese)
+DecompressGlyphFont8: ; 8006648
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
 	cmp r1, 0x1
-	bne _08006694
+	bne @08006694
 	lsrs r2, r0, 20
 	lsls r2, 9
 	movs r0, 0xF
@@ -4341,10 +4341,10 @@ DecompressGlyphFont8: @ 8006648
 	adds r4, 0x81
 	movs r0, 0xC
 	strb r0, [r4]
-	b _08006704
+	b @08006704
 	.align 2, 0
 	.pool
-_08006694:
+@08006694:
 	lsls r1, r3, 6
 	ldr r0, =gFont8LatinGlyphs
 	adds r5, r1, r0
@@ -4356,7 +4356,7 @@ _08006694:
 	adds r0, 0x80
 	strb r1, [r0]
 	cmp r1, 0x8
-	bhi _080066D0
+	bhi @080066D0
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4365,10 +4365,10 @@ _08006694:
 	adds r1, r4, 0
 	adds r1, 0x40
 	bl DecompressGlyphTile
-	b _080066FC
+	b @080066FC
 	.align 2, 0
 	.pool
-_080066D0:
+@080066D0:
 	adds r0, r5, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4387,12 +4387,12 @@ _080066D0:
 	adds r1, r4, 0
 	adds r1, 0x60
 	bl DecompressGlyphTile
-_080066FC:
+@080066FC:
 	ldr r0, =0x03002f90
 	adds r0, 0x81
 	movs r1, 0xC
 	strb r1, [r0]
-_08006704:
+@08006704:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -4401,32 +4401,32 @@ _08006704:
 	thumb_func_end DecompressGlyphFont8
 
 	thumb_func_start GetGlyphWidthFont8
-GetGlyphWidthFont8: @ 8006710
+GetGlyphWidthFont8: ; 8006710
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r1, 0x1
-	beq _08006728
+	beq @08006728
 	ldr r0, =gFont8LatinGlyphWidths
 	adds r0, r2, r0
 	ldrb r0, [r0]
-	b _0800672A
+	b @0800672A
 	.align 2, 0
 	.pool
-_08006728:
+@08006728:
 	movs r0, 0x8
-_0800672A:
+@0800672A:
 	pop {r1}
 	bx r1
 	thumb_func_end GetGlyphWidthFont8
 
 	thumb_func_start DecompressGlyphFont2
-DecompressGlyphFont2: @ 8006730
+DecompressGlyphFont2: ; 8006730
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
 	cmp r1, 0x1
-	bne _080067A0
+	bne @080067A0
 	lsrs r2, r0, 19
 	lsls r2, 9
 	movs r0, 0x7
@@ -4466,10 +4466,10 @@ DecompressGlyphFont2: @ 8006730
 	adds r1, 0x81
 	movs r0, 0xE
 	strb r0, [r1]
-	b _08006810
+	b @08006810
 	.align 2, 0
 	.pool
-_080067A0:
+@080067A0:
 	lsls r1, r6, 6
 	ldr r0, =gFont2LatinGlyphs
 	adds r4, r1, r0
@@ -4481,7 +4481,7 @@ _080067A0:
 	adds r0, 0x80
 	strb r1, [r0]
 	cmp r1, 0x8
-	bhi _080067DC
+	bhi @080067DC
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl DecompressGlyphTile
@@ -4490,10 +4490,10 @@ _080067A0:
 	adds r1, r5, 0
 	adds r1, 0x40
 	bl DecompressGlyphTile
-	b _08006808
+	b @08006808
 	.align 2, 0
 	.pool
-_080067DC:
+@080067DC:
 	adds r0, r4, 0
 	adds r1, r5, 0
 	bl DecompressGlyphTile
@@ -4512,12 +4512,12 @@ _080067DC:
 	adds r1, r5, 0
 	adds r1, 0x60
 	bl DecompressGlyphTile
-_08006808:
+@08006808:
 	ldr r0, =0x03002f90
 	adds r0, 0x81
 	movs r1, 0xE
 	strb r1, [r0]
-_08006810:
+@08006810:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -4526,19 +4526,19 @@ _08006810:
 	thumb_func_end DecompressGlyphFont2
 
 	thumb_func_start GetGlyphWidthFont2
-GetGlyphWidthFont2: @ 800681C
+GetGlyphWidthFont2: ; 800681C
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r1, 0x1
-	beq _08006830
+	beq @08006830
 	ldr r0, =gFont2LatinGlyphWidths
-	b _08006832
+	b @08006832
 	.align 2, 0
 	.pool
-_08006830:
+@08006830:
 	ldr r0, =gFont2JapaneseGlyphWidths
-_08006832:
+@08006832:
 	adds r0, r2, r0
 	ldrb r0, [r0]
 	pop {r1}
@@ -4548,13 +4548,13 @@ _08006832:
 	thumb_func_end GetGlyphWidthFont2
 
 	thumb_func_start DecompressGlyphFont1
-@ void DecompressGlyphFont1(int a1, int japanese)
-DecompressGlyphFont1: @ 8006840
+; void DecompressGlyphFont1(int a1, int japanese)
+DecompressGlyphFont1: ; 8006840
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r3, r0, 16
 	cmp r1, 0x1
-	bne _0800688C
+	bne @0800688C
 	lsrs r2, r0, 20
 	lsls r2, 9
 	movs r5, 0xF
@@ -4580,10 +4580,10 @@ DecompressGlyphFont1: @ 8006840
 	strb r0, [r1]
 	adds r4, 0x81
 	strb r5, [r4]
-	b _080068FC
+	b @080068FC
 	.align 2, 0
 	.pool
-_0800688C:
+@0800688C:
 	lsls r1, r3, 6
 	ldr r0, =gFont1LatinGlyphs
 	adds r6, r1, r0
@@ -4595,7 +4595,7 @@ _0800688C:
 	adds r0, 0x80
 	strb r1, [r0]
 	cmp r1, 0x8
-	bhi _080068C8
+	bhi @080068C8
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4604,10 +4604,10 @@ _0800688C:
 	adds r1, r4, 0
 	adds r1, 0x40
 	bl DecompressGlyphTile
-	b _080068F4
+	b @080068F4
 	.align 2, 0
 	.pool
-_080068C8:
+@080068C8:
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl DecompressGlyphTile
@@ -4626,12 +4626,12 @@ _080068C8:
 	adds r1, r4, 0
 	adds r1, 0x60
 	bl DecompressGlyphTile
-_080068F4:
+@080068F4:
 	ldr r0, =0x03002f90
 	adds r0, 0x81
 	movs r1, 0xF
 	strb r1, [r0]
-_080068FC:
+@080068FC:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -4640,27 +4640,27 @@ _080068FC:
 	thumb_func_end DecompressGlyphFont1
 
 	thumb_func_start GetGlyphWidthFont1
-GetGlyphWidthFont1: @ 8006908
+GetGlyphWidthFont1: ; 8006908
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r1, 0x1
-	beq _08006920
+	beq @08006920
 	ldr r0, =gFont1LatinGlyphWidths
 	adds r0, r2, r0
 	ldrb r0, [r0]
-	b _08006922
+	b @08006922
 	.align 2, 0
 	.pool
-_08006920:
+@08006920:
 	movs r0, 0x8
-_08006922:
+@08006922:
 	pop {r1}
 	bx r1
 	thumb_func_end GetGlyphWidthFont1
 
 	thumb_func_start DecompressGlyphFont9
-DecompressGlyphFont9: @ 8006928
+DecompressGlyphFont9: ; 8006928
 	push {r4,r5,lr}
 	lsls r0, 16
 	lsrs r4, r0, 20