get rid of @ local labels

1 files changed, 594 insertions, 594 deletions

diff --git a/asm/gpu_bg.s b/asm/gpu_bg.s
index 6c0729f49..3edc8c458 100644
--- a/asm/gpu_bg.s
+++ b/asm/gpu_bg.s
@@ -47,11 +47,11 @@ ResetBgControlStructs: ; 8001334
 	ldr r0, [r0]
 	adds r1, r2, 0
 	adds r1, 0xC
-@08001340:
+_08001340:
 	str r0, [r1]
 	subs r1, 0x4
 	cmp r1, r2
-	bge @08001340
+	bge _08001340
 	pop {r0}
 	bx r0
 	.pool
@@ -67,14 +67,14 @@ Unused_ResetBgControlStruct: ; 8001354
 	bl IsInvalidBg
 	lsls r0, 24
 	cmp r0, 0
-	bne @08001372
+	bne _08001372
 	ldr r1, =0x030008e0
 	lsls r0, r4, 2
 	adds r0, r1
 	ldr r1, =gZeroedBgControlStruct
 	ldr r1, [r1]
 	str r1, [r0]
-@08001372:
+_08001372:
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -125,12 +125,12 @@ SetBgControlAttributes: ; 8001380
 	lsrs r0, 24
 	mov r12, r0
 	cmp r0, 0
-	bne @08001498
+	bne _08001498
 	ldr r2, =0x030008e0
 	mov r8, r2
 	mov r0, r10
 	cmp r0, 0xFF
-	beq @080013F4
+	beq _080013F4
 	lsls r2, r7, 2
 	add r2, r8
 	movs r1, 0x3
@@ -141,9 +141,9 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r3
 	orrs r0, r1
 	strb r0, [r2, 0x1]
-@080013F4:
+_080013F4:
 	cmp r6, 0xFF
-	beq @0800140C
+	beq _0800140C
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x1F
@@ -154,10 +154,10 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1, 0x1]
-@0800140C:
+_0800140C:
 	mov r1, r9
 	cmp r1, 0xFF
-	beq @08001428
+	beq _08001428
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x3
@@ -169,10 +169,10 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-@08001428:
+_08001428:
 	ldr r6, [sp, 0x4]
 	cmp r6, 0xFF
-	beq @0800143E
+	beq _0800143E
 	lsls r1, r7, 2
 	add r1, r8
 	lsls r3, r6, 7
@@ -181,9 +181,9 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1, 0x1]
-@0800143E:
+_0800143E:
 	cmp r5, 0xFF
-	beq @08001456
+	beq _08001456
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x3
@@ -194,9 +194,9 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-@08001456:
+_08001456:
 	cmp r4, 0xFF
-	beq @0800146E
+	beq _0800146E
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x1
@@ -207,10 +207,10 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-@0800146E:
+_0800146E:
 	ldr r0, [sp, 0xC]
 	cmp r0, 0xFF
-	beq @08001484
+	beq _08001484
 	lsls r1, r7, 2
 	add r1, r8
 	lsls r3, r0, 7
@@ -219,7 +219,7 @@ SetBgControlAttributes: ; 8001380
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-@08001484:
+_08001484:
 	ldr r1, [sp]
 	lsls r0, r1, 2
 	add r0, r8
@@ -230,7 +230,7 @@ SetBgControlAttributes: ; 8001380
 	movs r2, 0x1
 	orrs r1, r2
 	strb r1, [r0]
-@08001498:
+_08001498:
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -254,7 +254,7 @@ GetBgControlAttribute: ; 80014AC
 	bl IsInvalidBg
 	lsls r0, 24
 	cmp r0, 0
-	bne @08001558
+	bne _08001558
 	ldr r1, =0x030008e0
 	lsls r2, r4, 2
 	adds r0, r2, r1
@@ -262,75 +262,75 @@ GetBgControlAttribute: ; 80014AC
 	lsls r0, 31
 	adds r3, r1, 0
 	cmp r0, 0
-	beq @08001558
+	beq _08001558
 	subs r0, r5, 0x1
 	cmp r0, 0x7
-	bhi @08001558
+	bhi _08001558
 	lsls r0, 2
-	ldr r1, =@080014EC
+	ldr r1, =_080014EC
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.pool
 	.align 2, 0
-@080014EC:
-	.4byte @0800150C
-	.4byte @08001516
-	.4byte @08001520
-	.4byte @0800152A
-	.4byte @08001534
-	.4byte @0800153C
-	.4byte @08001546
-	.4byte @08001550
-@0800150C:
+_080014EC:
+	.4byte _0800150C
+	.4byte _08001516
+	.4byte _08001520
+	.4byte _0800152A
+	.4byte _08001534
+	.4byte _0800153C
+	.4byte _08001546
+	.4byte _08001550
+_0800150C:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 31
 	lsrs r0, 31
-	b @0800155A
-@08001516:
+	b _0800155A
+_08001516:
 	adds r0, r2, r3
 	ldrb r0, [r0, 0x1]
 	lsls r0, 30
 	lsrs r0, 30
-	b @0800155A
-@08001520:
+	b _0800155A
+_08001520:
 	adds r0, r2, r3
 	ldrb r0, [r0, 0x1]
 	lsls r0, 25
 	lsrs r0, 27
-	b @0800155A
-@0800152A:
+	b _0800155A
+_0800152A:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 28
 	lsrs r0, 30
-	b @0800155A
-@08001534:
+	b _0800155A
+_08001534:
 	adds r0, r2, r3
 	ldrb r0, [r0, 0x1]
 	lsrs r0, 7
-	b @0800155A
-@0800153C:
+	b _0800155A
+_0800153C:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 26
 	lsrs r0, 30
-	b @0800155A
-@08001546:
+	b _0800155A
+_08001546:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 25
 	lsrs r0, 31
-	b @0800155A
-@08001550:
+	b _0800155A
+_08001550:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsrs r0, 7
-	b @0800155A
-@08001558:
+	b _0800155A
+_08001558:
 	movs r0, 0xFF
-@0800155A:
+_0800155A:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
@@ -356,32 +356,32 @@ LoadBgVram: ; 8001560
 	bl IsInvalidBg
 	lsls r0, 24
 	cmp r0, 0
-	bne @080015D8
+	bne _080015D8
 	ldr r1, =0x030008e0
 	lsls r0, r4, 2
 	adds r1, r0, r1
 	ldrb r0, [r1]
 	lsls r0, 31
 	cmp r0, 0
-	beq @080015D8
+	beq _080015D8
 	cmp r5, 0x1
-	beq @080015A4
+	beq _080015A4
 	cmp r5, 0x2
-	beq @080015AC
+	beq _080015AC
 	movs r2, 0xFF
-	b @080015DC
+	b _080015DC
 	.pool
-@080015A4:
+_080015A4:
 	ldrb r0, [r1, 0x1]
 	lsls r0, 30
 	lsrs r0, 16
-	b @080015B4
-@080015AC:
+	b _080015B4
+_080015AC:
 	ldrb r0, [r1, 0x1]
 	lsls r0, 25
 	lsrs r0, 27
 	lsls r0, 11
-@080015B4:
+_080015B4:
 	adds r0, r6, r0
 	lsls r0, 16
 	lsrs r0, 16
@@ -398,13 +398,13 @@ LoadBgVram: ; 8001560
 	movs r1, 0x1
 	negs r1, r1
 	cmp r0, r1
-	bne @080015DC
-@080015D8:
+	bne _080015DC
+_080015D8:
 	movs r0, 0xFF
-	b @080015DE
-@080015DC:
+	b _080015DE
+_080015DC:
 	adds r0, r2, 0
-@080015DE:
+_080015DE:
 	pop {r3}
 	mov r8, r3
 	pop {r4-r7}
@@ -422,14 +422,14 @@ ShowBgInternal: ; 80015E8
 	bl IsInvalidBg
 	lsls r0, 24
 	cmp r0, 0
-	bne @08001656
+	bne _08001656
 	ldr r5, =0x030008e0
 	lsls r0, r4, 2
 	adds r2, r0, r5
 	ldrb r3, [r2]
 	lsls r0, r3, 31
 	cmp r0, 0
-	beq @08001656
+	beq _08001656
 	lsls r1, r3, 26
 	lsrs r1, 30
 	ldrb r2, [r2, 0x1]
@@ -468,7 +468,7 @@ ShowBgInternal: ; 80015E8
 	ldr r1, =0x00000f07
 	ands r0, r1
 	strh r0, [r5, 0x10]
-@08001656:
+_08001656:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -485,7 +485,7 @@ HideBgInternal: ; 8001664
 	bl IsInvalidBg
 	lsls r0, 24
 	cmp r0, 0
-	bne @0800168A
+	bne _0800168A
 	ldr r2, =0x030008e0
 	adds r0, r4, 0
 	adds r0, 0x8
@@ -496,7 +496,7 @@ HideBgInternal: ; 8001664
 	ldr r1, =0x00000f07
 	ands r0, r1
 	strh r0, [r2, 0x10]
-@0800168A:
+_0800168A:
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -566,24 +566,24 @@ SetBgAffineInternal: ; 80016D8
 	movs r1, 0x7
 	ands r1, r0
 	cmp r1, 0x1
-	beq @08001720
+	beq _08001720
 	cmp r1, 0x1
-	ble @08001796
+	ble _08001796
 	cmp r1, 0x2
-	beq @08001726
-	b @08001796
+	beq _08001726
+	b _08001796
 	.pool
-@08001720:
+_08001720:
 	cmp r6, 0x2
-	bne @08001796
-	b @08001730
-@08001726:
+	bne _08001796
+	b _08001730
+_08001726:
 	subs r0, r6, 0x2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
-	bhi @08001796
-@08001730:
+	bhi _08001796
+_08001730:
 	mov r0, r12
 	str r0, [sp]
 	mov r0, r8
@@ -625,7 +625,7 @@ SetBgAffineInternal: ; 80016D8
 	ldrh r1, [r4, 0xE]
 	movs r0, 0x2E
 	bl SetGpuReg
-@08001796:
+_08001796:
 	add sp, 0x24
 	pop {r3}
 	mov r8, r3
@@ -641,12 +641,12 @@ IsInvalidBg: ; 80017A4
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
-	bhi @080017B2
+	bhi _080017B2
 	movs r0, 0
-	b @080017B4
-@080017B2:
+	b _080017B4
+_080017B2:
 	movs r0, 0x1
-@080017B4:
+_080017B4:
 	pop {r1}
 	bx r1
 	thumb_func_end IsInvalidBg
@@ -668,11 +668,11 @@ ResetBgsAndClearDma3BusyFlags: ; 80017BC
 	movs r2, 0
 	adds r0, r1, 0
 	adds r0, 0xC
-@080017CC:
+_080017CC:
 	str r2, [r0]
 	subs r0, 0x4
 	cmp r0, r1
-	bge @080017CC
+	bge _080017CC
 	ldr r0, =0x03002f54
 	str r4, [r0]
 	pop {r4}
@@ -698,7 +698,7 @@ InitBgsFromTemplates: ; 80017E8
 	bl SetBgModeInternal
 	bl ResetBgControlStructs
 	cmp r4, 0
-	beq @08001894
+	beq _08001894
 	movs r7, 0
 	ldr r0, =0x030008f8
 	mov r9, r0
@@ -707,12 +707,12 @@ InitBgsFromTemplates: ; 80017E8
 	mov r10, r2
 	adds r6, r5, 0
 	mov r8, r4
-@0800181A:
+_0800181A:
 	ldr r4, [r6]
 	lsls r0, r4, 30
 	lsrs r5, r0, 30
 	cmp r5, 0x3
-	bhi @08001886
+	bhi _08001886
 	lsls r1, r4, 28
 	lsrs r1, 30
 	lsls r2, r4, 23
@@ -761,15 +761,15 @@ InitBgsFromTemplates: ; 80017E8
 	str r7, [r0]
 	add r4, r10
 	str r7, [r4]
-@08001886:
+_08001886:
 	adds r6, 0x4
 	movs r5, 0x1
 	negs r5, r5
 	add r8, r5
 	mov r0, r8
 	cmp r0, 0
-	bne @0800181A
-@08001894:
+	bne _0800181A
+_08001894:
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -791,7 +791,7 @@ InitBgFromTemplate: ; 80018B0
 	lsls r0, r4, 30
 	lsrs r5, r0, 30
 	cmp r5, 0x3
-	bhi @08001920
+	bhi _08001920
 	lsls r1, r4, 28
 	lsrs r1, 30
 	lsls r2, r4, 23
@@ -839,7 +839,7 @@ InitBgFromTemplate: ; 80018B0
 	adds r4, 0xC
 	adds r5, r4
 	str r6, [r5]
-@08001920:
+_08001920:
 	add sp, 0x10
 	pop {r4-r7}
 	pop {r0}
@@ -878,7 +878,7 @@ LoadBgTiles: ; 8001944
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	bne @08001980
+	bne _08001980
 	ldr r1, =0x030008f8
 	lsls r0, r5, 4
 	adds r0, r1
@@ -887,9 +887,9 @@ LoadBgTiles: ; 8001944
 	lsrs r0, 22
 	adds r0, r4
 	lsls r0, 21
-	b @08001990
+	b _08001990
 	.pool
-@08001980:
+_08001980:
 	ldr r1, =0x030008f8
 	lsls r0, r5, 4
 	adds r0, r1
@@ -898,7 +898,7 @@ LoadBgTiles: ; 8001944
 	lsrs r0, 22
 	adds r0, r4
 	lsls r0, 22
-@08001990:
+_08001990:
 	lsrs r4, r0, 16
 	movs r6, 0x1
 	str r6, [sp]
@@ -911,11 +911,11 @@ LoadBgTiles: ; 8001944
 	lsrs r1, r2, 24
 	adds r7, r1, 0
 	cmp r1, 0xFF
-	bne @080019B8
+	bne _080019B8
 	ldr r0, =0x0000ffff
-	b @080019E6
+	b _080019E6
 	.pool
-@080019B8:
+_080019B8:
 	ldr r0, =0x03000938
 	lsrs r2, 29
 	lsls r2, 2
@@ -930,16 +930,16 @@ LoadBgTiles: ; 8001944
 	ldr r0, =0x03002f54
 	ldr r0, [r0]
 	cmp r0, 0x1
-	bne @080019E4
+	bne _080019E4
 	lsrs r1, r4, 5
 	mov r0, r8
 	lsrs r2, r0, 5
 	adds r0, r5, 0
 	movs r3, 0x1
 	bl DummiedOutFireRedLeafGreenTileAllocFunc
-@080019E4:
+_080019E4:
 	adds r0, r7, 0
-@080019E6:
+_080019E6:
 	add sp, 0x4
 	pop {r3}
 	mov r8, r3
@@ -966,7 +966,7 @@ LoadBgTilemap: ; 80019FC
 	lsls r2, r0, 24
 	lsrs r3, r2, 24
 	cmp r3, 0xFF
-	beq @08001A3C
+	beq _08001A3C
 	ldr r0, =0x03000938
 	lsrs r2, 29
 	lsls r2, 2
@@ -979,11 +979,11 @@ LoadBgTilemap: ; 80019FC
 	orrs r0, r1
 	str r0, [r2]
 	adds r0, r3, 0
-	b @08001A3E
+	b _08001A3E
 	.pool
-@08001A3C:
+_08001A3C:
 	ldr r0, =0x0000ffff
-@08001A3E:
+_08001A3E:
 	add sp, 0x4
 	pop {r4}
 	pop {r1}
@@ -1005,7 +1005,7 @@ Unused_LoadBgPalette: ; 8001A4C
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08001A98
+	bne _08001A98
 	ldr r1, =0x030008f8
 	lsls r0, r4, 4
 	adds r0, r1
@@ -1029,18 +1029,18 @@ Unused_LoadBgPalette: ; 8001A4C
 	movs r0, 0x1
 	negs r0, r0
 	cmp r1, r0
-	bne @08001AA4
-@08001A98:
+	bne _08001AA4
+_08001A98:
 	ldr r0, =0x0000ffff
-	b @08001AC8
+	b _08001AC8
 	.pool
-@08001AA4:
+_08001AA4:
 	ldr r4, =0x03000938
 	adds r0, r1, 0
 	cmp r1, 0
-	bge @08001AAE
+	bge _08001AAE
 	adds r0, 0x1F
-@08001AAE:
+_08001AAE:
 	asrs r0, 5
 	lsls r2, r0, 2
 	adds r2, r4
@@ -1054,7 +1054,7 @@ Unused_LoadBgPalette: ; 8001A4C
 	orrs r0, r1
 	str r0, [r2]
 	lsrs r0, r3, 24
-@08001AC8:
+_08001AC8:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
@@ -1068,12 +1068,12 @@ IsDma3ManagerBusyWithBgCopy: ; 8001AD4
 	movs r5, 0
 	movs r7, 0x1
 	negs r7, r7
-@08001ADC:
+_08001ADC:
 	adds r0, r5, 0
 	cmp r5, 0
-	bge @08001AE4
+	bge _08001AE4
 	adds r0, 0x1F
-@08001AE4:
+_08001AE4:
 	asrs r0, 5
 	lsls r2, r0, 24
 	lsls r0, 5
@@ -1088,27 +1088,27 @@ IsDma3ManagerBusyWithBgCopy: ; 8001AD4
 	ldr r0, [r4]
 	ands r0, r6
 	cmp r0, 0
-	beq @08001B22
+	beq _08001B22
 	lsls r0, r5, 16
 	asrs r0, 16
 	bl CheckForSpaceForDma3Request
 	lsls r0, 24
 	asrs r0, 24
 	cmp r0, r7
-	bne @08001B1C
+	bne _08001B1C
 	movs r0, 0x1
-	b @08001B2A
+	b _08001B2A
 	.pool
-@08001B1C:
+_08001B1C:
 	ldr r0, [r4]
 	bics r0, r6
 	str r0, [r4]
-@08001B22:
+_08001B22:
 	adds r5, 0x1
 	cmp r5, 0x7F
-	ble @08001ADC
+	ble _08001ADC
 	movs r0, 0
-@08001B2A:
+_08001B2A:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
@@ -1151,23 +1151,23 @@ SetBgAttribute: ; 8001B58
 	lsrs r3, r2, 24
 	subs r0, r1, 0x1
 	cmp r0, 0x6
-	bhi @08001C12
+	bhi _08001C12
 	lsls r0, 2
-	ldr r1, =@08001B7C
+	ldr r1, =_08001B7C
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.pool
 	.align 2, 0
-@08001B7C:
-	.4byte @08001B98
-	.4byte @08001BA8
-	.4byte @08001BBA
-	.4byte @08001BD0
-	.4byte @08001BE4
-	.4byte @08001BFC
-	.4byte @08001BDA
-@08001B98:
+_08001B7C:
+	.4byte _08001B98
+	.4byte _08001BA8
+	.4byte _08001BBA
+	.4byte _08001BD0
+	.4byte _08001BE4
+	.4byte _08001BFC
+	.4byte _08001BDA
+_08001B98:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1175,8 +1175,8 @@ SetBgAttribute: ; 8001B58
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	adds r1, r3, 0
-	b @08001BF2
-@08001BA8:
+	b _08001BF2
+_08001BA8:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1185,8 +1185,8 @@ SetBgAttribute: ; 8001B58
 	adds r0, r4, 0
 	movs r1, 0xFF
 	adds r2, r3, 0
-	b @08001BF4
-@08001BBA:
+	b _08001BF4
+_08001BBA:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1196,35 +1196,35 @@ SetBgAttribute: ; 8001B58
 	movs r1, 0xFF
 	movs r2, 0xFF
 	bl SetBgControlAttributes
-	b @08001C12
-@08001BD0:
+	b _08001C12
+_08001BD0:
 	str r3, [sp]
 	movs r0, 0xFF
 	str r0, [sp, 0x4]
 	str r0, [sp, 0x8]
-	b @08001BEC
-@08001BDA:
+	b _08001BEC
+_08001BDA:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r3, [sp, 0x4]
 	str r0, [sp, 0x8]
-	b @08001BEC
-@08001BE4:
+	b _08001BEC
+_08001BE4:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
 	str r3, [sp, 0x8]
-@08001BEC:
+_08001BEC:
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	movs r1, 0xFF
-@08001BF2:
+_08001BF2:
 	movs r2, 0xFF
-@08001BF4:
+_08001BF4:
 	movs r3, 0xFF
 	bl SetBgControlAttributes
-	b @08001C12
-@08001BFC:
+	b _08001C12
+_08001BFC:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1235,7 +1235,7 @@ SetBgAttribute: ; 8001B58
 	movs r2, 0xFF
 	movs r3, 0xFF
 	bl SetBgControlAttributes
-@08001C12:
+_08001C12:
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -1252,102 +1252,102 @@ GetBgAttribute: ; 8001C1C
 	lsrs r1, 24
 	subs r0, r1, 0x1
 	cmp r0, 0x9
-	bhi @08001CF8
+	bhi _08001CF8
 	lsls r0, 2
-	ldr r1, =@08001C3C
+	ldr r1, =_08001C3C
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.pool
 	.align 2, 0
-@08001C3C:
-	.4byte @08001C64
-	.4byte @08001C6E
-	.4byte @08001C78
-	.4byte @08001C82
-	.4byte @08001C96
-	.4byte @08001CA0
-	.4byte @08001C8C
-	.4byte @08001CAA
-	.4byte @08001CD8
-	.4byte @08001CE4
-@08001C64:
+_08001C3C:
+	.4byte _08001C64
+	.4byte _08001C6E
+	.4byte _08001C78
+	.4byte _08001C82
+	.4byte _08001C96
+	.4byte _08001CA0
+	.4byte _08001C8C
+	.4byte _08001CAA
+	.4byte _08001CD8
+	.4byte _08001CE4
+_08001C64:
 	adds r0, r4, 0
 	movs r1, 0x2
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001C6E:
+	b _08001CDE
+_08001C6E:
 	adds r0, r4, 0
 	movs r1, 0x3
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001C78:
+	b _08001CDE
+_08001C78:
 	adds r0, r4, 0
 	movs r1, 0x4
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001C82:
+	b _08001CDE
+_08001C82:
 	adds r0, r4, 0
 	movs r1, 0x5
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001C8C:
+	b _08001CDE
+_08001C8C:
 	adds r0, r4, 0
 	movs r1, 0x6
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001C96:
+	b _08001CDE
+_08001C96:
 	adds r0, r4, 0
 	movs r1, 0x7
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001CA0:
+	b _08001CDE
+_08001CA0:
 	adds r0, r4, 0
 	movs r1, 0x8
 	bl GetBgControlAttribute
-	b @08001CDE
-@08001CAA:
+	b _08001CDE
+_08001CAA:
 	adds r0, r4, 0
 	bl GetBgType
 	cmp r0, 0
-	beq @08001CBC
+	beq _08001CBC
 	cmp r0, 0x1
-	beq @08001CCA
+	beq _08001CCA
 	movs r0, 0
-	b @08001CFA
-@08001CBC:
+	b _08001CFA
+_08001CBC:
 	adds r0, r4, 0
 	movs r1, 0
 	bl GetBgMetricTextMode
 	lsls r0, 27
 	lsrs r0, 16
-	b @08001CFA
-@08001CCA:
+	b _08001CFA
+_08001CCA:
 	adds r0, r4, 0
 	movs r1, 0
 	bl GetBgMetricAffineMode
 	lsls r0, 24
 	lsrs r0, 16
-	b @08001CFA
-@08001CD8:
+	b _08001CFA
+_08001CD8:
 	adds r0, r4, 0
 	bl GetBgType
-@08001CDE:
+_08001CDE:
 	lsls r0, 16
 	lsrs r0, 16
-	b @08001CFA
-@08001CE4:
+	b _08001CFA
+_08001CE4:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r1, r0
 	ldrh r0, [r1]
 	lsls r0, 22
 	lsrs r0, 22
-	b @08001CFA
+	b _08001CFA
 	.pool
-@08001CF8:
+_08001CF8:
 	ldr r0, =0x0000ffff
-@08001CFA:
+_08001CFA:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -1366,100 +1366,100 @@ ChangeBgX: ; 8001D04
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08001D28
+	bne _08001D28
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	bne @08001D2E
-@08001D28:
+	bne _08001D2E
+_08001D28:
 	movs r0, 0x1
 	negs r0, r0
-	b @08001E34
-@08001D2E:
+	b _08001E34
+_08001D2E:
 	cmp r5, 0x1
-	beq @08001D4C
+	beq _08001D4C
 	cmp r5, 0x1
-	ble @08001D3A
+	ble _08001D3A
 	cmp r5, 0x2
-	beq @08001D60
-@08001D3A:
+	beq _08001D60
+_08001D3A:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x8
 	adds r0, r1, r0
 	str r6, [r0]
 	adds r5, r1, 0
-	b @08001D70
+	b _08001D70
 	.pool
-@08001D4C:
+_08001D4C:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0x8
 	adds r0, r2, r0
 	ldr r1, [r0]
 	adds r1, r6
-	b @08001D6C
+	b _08001D6C
 	.pool
-@08001D60:
+_08001D60:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0x8
 	adds r0, r2, r0
 	ldr r1, [r0]
 	subs r1, r6
-@08001D6C:
+_08001D6C:
 	str r1, [r0]
 	adds r5, r2, 0
-@08001D70:
+_08001D70:
 	bl GetBgMode
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq @08001DAC
+	beq _08001DAC
 	cmp r4, 0x1
-	bgt @08001D8C
+	bgt _08001D8C
 	cmp r4, 0
-	beq @08001D96
-	b @08001E2C
+	beq _08001D96
+	b _08001E2C
 	.pool
-@08001D8C:
+_08001D8C:
 	cmp r4, 0x2
-	beq @08001DC0
+	beq _08001DC0
 	cmp r4, 0x3
-	beq @08001DF8
-	b @08001E2C
-@08001D96:
+	beq _08001DF8
+	b _08001E2C
+_08001D96:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x8]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x10
 	bl SetGpuReg
-	b @08001E2C
+	b _08001E2C
 	.pool
-@08001DAC:
+_08001DAC:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x18]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x14
 	bl SetGpuReg
-	b @08001E2C
+	b _08001E2C
 	.pool
-@08001DC0:
+_08001DC0:
 	cmp r0, 0
-	bne @08001DD8
+	bne _08001DD8
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x28]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x18
 	bl SetGpuReg
-	b @08001E2C
+	b _08001E2C
 	.pool
-@08001DD8:
+_08001DD8:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x28]
 	lsrs r1, r0, 16
@@ -1470,22 +1470,22 @@ ChangeBgX: ; 8001D04
 	movs r0, 0x28
 	adds r1, r4, 0
 	bl SetGpuReg
-	b @08001E2C
+	b _08001E2C
 	.pool
-@08001DF8:
+_08001DF8:
 	cmp r0, 0
-	bne @08001E10
+	bne _08001E10
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x38]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1C
 	bl SetGpuReg
-	b @08001E2C
+	b _08001E2C
 	.pool
-@08001E10:
+_08001E10:
 	cmp r0, 0x2
-	bne @08001E2C
+	bne _08001E2C
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x38]
 	lsrs r1, r0, 16
@@ -1496,12 +1496,12 @@ ChangeBgX: ; 8001D04
 	movs r0, 0x38
 	adds r1, r4, 0
 	bl SetGpuReg
-@08001E2C:
+_08001E2C:
 	ldr r0, =0x030008f8
 	adds r0, 0x8
 	adds r0, r5, r0
 	ldr r0, [r0]
-@08001E34:
+_08001E34:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -1517,24 +1517,24 @@ GetBgX: ; 8001E40
 	adds r4, r0, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08001E70
+	bne _08001E70
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	beq @08001E70
+	beq _08001E70
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x8
 	adds r1, r0
 	ldr r0, [r1]
-	b @08001E74
+	b _08001E74
 	.pool
-@08001E70:
+_08001E70:
 	movs r0, 0x1
 	negs r0, r0
-@08001E74:
+_08001E74:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -1552,100 +1552,100 @@ ChangeBgY: ; 8001E7C
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08001EA0
+	bne _08001EA0
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	bne @08001EA6
-@08001EA0:
+	bne _08001EA6
+_08001EA0:
 	movs r0, 0x1
 	negs r0, r0
-	b @08001FAC
-@08001EA6:
+	b _08001FAC
+_08001EA6:
 	cmp r5, 0x1
-	beq @08001EC4
+	beq _08001EC4
 	cmp r5, 0x1
-	ble @08001EB2
+	ble _08001EB2
 	cmp r5, 0x2
-	beq @08001ED8
-@08001EB2:
+	beq _08001ED8
+_08001EB2:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0xC
 	adds r0, r1, r0
 	str r6, [r0]
 	adds r5, r1, 0
-	b @08001EE8
+	b _08001EE8
 	.pool
-@08001EC4:
+_08001EC4:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	adds r1, r6
-	b @08001EE4
+	b _08001EE4
 	.pool
-@08001ED8:
+_08001ED8:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	subs r1, r6
-@08001EE4:
+_08001EE4:
 	str r1, [r0]
 	adds r5, r2, 0
-@08001EE8:
+_08001EE8:
 	bl GetBgMode
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq @08001F24
+	beq _08001F24
 	cmp r4, 0x1
-	bgt @08001F04
+	bgt _08001F04
 	cmp r4, 0
-	beq @08001F0E
-	b @08001FA4
+	beq _08001F0E
+	b _08001FA4
 	.pool
-@08001F04:
+_08001F04:
 	cmp r4, 0x2
-	beq @08001F38
+	beq _08001F38
 	cmp r4, 0x3
-	beq @08001F70
-	b @08001FA4
-@08001F0E:
+	beq _08001F70
+	b _08001FA4
+_08001F0E:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0xC]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x12
 	bl SetGpuReg
-	b @08001FA4
+	b _08001FA4
 	.pool
-@08001F24:
+_08001F24:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x1C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x16
 	bl SetGpuReg
-	b @08001FA4
+	b _08001FA4
 	.pool
-@08001F38:
+_08001F38:
 	cmp r0, 0
-	bne @08001F50
+	bne _08001F50
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1A
 	bl SetGpuReg
-	b @08001FA4
+	b _08001FA4
 	.pool
-@08001F50:
+_08001F50:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsrs r1, r0, 16
@@ -1656,22 +1656,22 @@ ChangeBgY: ; 8001E7C
 	movs r0, 0x2C
 	adds r1, r4, 0
 	bl SetGpuReg
-	b @08001FA4
+	b _08001FA4
 	.pool
-@08001F70:
+_08001F70:
 	cmp r0, 0
-	bne @08001F88
+	bne _08001F88
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1E
 	bl SetGpuReg
-	b @08001FA4
+	b _08001FA4
 	.pool
-@08001F88:
+_08001F88:
 	cmp r0, 0x2
-	bne @08001FA4
+	bne _08001FA4
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsrs r1, r0, 16
@@ -1682,12 +1682,12 @@ ChangeBgY: ; 8001E7C
 	movs r0, 0x3C
 	adds r1, r4, 0
 	bl SetGpuReg
-@08001FA4:
+_08001FA4:
 	ldr r0, =0x030008f8
 	adds r0, 0xC
 	adds r0, r5, r0
 	ldr r0, [r0]
-@08001FAC:
+_08001FAC:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -1706,100 +1706,100 @@ ChangeBgY_ScreenOff: ; 8001FB8
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08001FDC
+	bne _08001FDC
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	bne @08001FE2
-@08001FDC:
+	bne _08001FE2
+_08001FDC:
 	movs r0, 0x1
 	negs r0, r0
-	b @080020E8
-@08001FE2:
+	b _080020E8
+_08001FE2:
 	cmp r5, 0x1
-	beq @08002000
+	beq _08002000
 	cmp r5, 0x1
-	ble @08001FEE
+	ble _08001FEE
 	cmp r5, 0x2
-	beq @08002014
-@08001FEE:
+	beq _08002014
+_08001FEE:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0xC
 	adds r0, r1, r0
 	str r6, [r0]
 	adds r5, r1, 0
-	b @08002024
+	b _08002024
 	.pool
-@08002000:
+_08002000:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	adds r1, r6
-	b @08002020
+	b _08002020
 	.pool
-@08002014:
+_08002014:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	subs r1, r6
-@08002020:
+_08002020:
 	str r1, [r0]
 	adds r5, r2, 0
-@08002024:
+_08002024:
 	bl GetBgMode
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq @08002060
+	beq _08002060
 	cmp r4, 0x1
-	bgt @08002040
+	bgt _08002040
 	cmp r4, 0
-	beq @0800204A
-	b @080020E0
+	beq _0800204A
+	b _080020E0
 	.pool
-@08002040:
+_08002040:
 	cmp r4, 0x2
-	beq @08002074
+	beq _08002074
 	cmp r4, 0x3
-	beq @080020AC
-	b @080020E0
-@0800204A:
+	beq _080020AC
+	b _080020E0
+_0800204A:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0xC]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x12
 	bl SetGpuReg_ScreenOff
-	b @080020E0
+	b _080020E0
 	.pool
-@08002060:
+_08002060:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x1C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x16
 	bl SetGpuReg_ScreenOff
-	b @080020E0
+	b _080020E0
 	.pool
-@08002074:
+_08002074:
 	cmp r0, 0
-	bne @0800208C
+	bne _0800208C
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1A
 	bl SetGpuReg_ScreenOff
-	b @080020E0
+	b _080020E0
 	.pool
-@0800208C:
+_0800208C:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsrs r1, r0, 16
@@ -1810,22 +1810,22 @@ ChangeBgY_ScreenOff: ; 8001FB8
 	movs r0, 0x2C
 	adds r1, r4, 0
 	bl SetGpuReg_ScreenOff
-	b @080020E0
+	b _080020E0
 	.pool
-@080020AC:
+_080020AC:
 	cmp r0, 0
-	bne @080020C4
+	bne _080020C4
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1E
 	bl SetGpuReg_ScreenOff
-	b @080020E0
+	b _080020E0
 	.pool
-@080020C4:
+_080020C4:
 	cmp r0, 0x2
-	bne @080020E0
+	bne _080020E0
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsrs r1, r0, 16
@@ -1836,12 +1836,12 @@ ChangeBgY_ScreenOff: ; 8001FB8
 	movs r0, 0x3C
 	adds r1, r4, 0
 	bl SetGpuReg_ScreenOff
-@080020E0:
+_080020E0:
 	ldr r0, =0x030008f8
 	adds r0, 0xC
 	adds r0, r5, r0
 	ldr r0, [r0]
-@080020E8:
+_080020E8:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -1857,24 +1857,24 @@ GetBgY: ; 80020F4
 	adds r4, r0, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08002124
+	bne _08002124
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	beq @08002124
+	beq _08002124
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0xC
 	adds r1, r0
 	ldr r0, [r1]
-	b @08002128
+	b _08002128
 	.pool
-@08002124:
+_08002124:
 	movs r0, 0x1
 	negs r0, r0
-@08002128:
+_08002128:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -1937,85 +1937,85 @@ Unused_AdjustBgMosaic: ; 8002170
 	lsls r0, 8
 	ands r5, r0
 	cmp r6, 0x6
-	bhi @080021C4
+	bhi _080021C4
 	lsls r0, r6, 2
-	ldr r1, =@080021A8
+	ldr r1, =_080021A8
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.pool
 	.align 2, 0
-@080021A8:
-	.4byte @080021C4
-	.4byte @080021CC
-	.4byte @080021D2
-	.4byte @080021E4
-	.4byte @080021FA
-	.4byte @08002200
-	.4byte @08002212
-@080021C4:
+_080021A8:
+	.4byte _080021C4
+	.4byte _080021CC
+	.4byte _080021D2
+	.4byte _080021E4
+	.4byte _080021FA
+	.4byte _08002200
+	.4byte _08002212
+_080021C4:
 	movs r3, 0xF
 	ands r3, r4
 	lsrs r2, r4, 4
-	b @08002226
-@080021CC:
+	b _08002226
+_080021CC:
 	movs r3, 0xF
 	ands r3, r4
-	b @08002226
-@080021D2:
+	b _08002226
+_080021D2:
 	lsls r0, r3, 16
 	asrs r0, 16
 	adds r0, r4
 	cmp r0, 0xF
-	ble @080021E0
+	ble _080021E0
 	movs r3, 0xF
-	b @08002226
-@080021E0:
+	b _08002226
+_080021E0:
 	adds r0, r3, r4
-	b @080021F4
-@080021E4:
+	b _080021F4
+_080021E4:
 	lsls r0, r3, 16
 	asrs r0, 16
 	subs r0, r4
 	cmp r0, 0
-	bge @080021F2
+	bge _080021F2
 	movs r3, 0
-	b @08002226
-@080021F2:
+	b _08002226
+_080021F2:
 	subs r0, r3, r4
-@080021F4:
+_080021F4:
 	lsls r0, 16
 	lsrs r3, r0, 16
-	b @08002226
-@080021FA:
+	b _08002226
+_080021FA:
 	movs r2, 0xF
 	ands r2, r4
-	b @08002226
-@08002200:
+	b _08002226
+_08002200:
 	lsls r0, r2, 16
 	asrs r0, 16
 	adds r0, r4
 	cmp r0, 0xF
-	ble @0800220E
+	ble _0800220E
 	movs r2, 0xF
-	b @08002226
-@0800220E:
+	b _08002226
+_0800220E:
 	adds r0, r2, r4
-	b @08002222
-@08002212:
+	b _08002222
+_08002212:
 	lsls r0, r2, 16
 	asrs r0, 16
 	subs r0, r4
 	cmp r0, 0
-	bge @08002220
+	bge _08002220
 	movs r2, 0
-	b @08002226
-@08002220:
+	b _08002226
+_08002220:
 	subs r0, r2, r4
-@08002222:
+_08002222:
 	lsls r0, 16
 	lsrs r2, r0, 16
-@08002226:
+_08002226:
 	lsls r0, r2, 16
 	asrs r0, 12
 	movs r1, 0xF0
@@ -2048,19 +2048,19 @@ SetBgTilemap: ; 8002250
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @0800227A
+	bne _0800227A
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	beq @0800227A
+	beq _0800227A
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
 	adds r1, r0
 	str r5, [r1]
-@0800227A:
+_0800227A:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -2077,19 +2077,19 @@ UnsetBgTilemap: ; 8002284
 	bl IsInvalidBg_
 	adds r5, r0, 0
 	cmp r5, 0
-	bne @080022AE
+	bne _080022AE
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	beq @080022AE
+	beq _080022AE
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
 	adds r1, r0
 	str r5, [r1]
-@080022AE:
+_080022AE:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -2105,23 +2105,23 @@ GetBgTilemap: ; 80022B8
 	adds r4, r0, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @080022E8
+	bne _080022E8
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl GetBgControlAttribute
 	lsls r0, 16
 	cmp r0, 0
-	beq @080022E8
+	beq _080022E8
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
 	adds r1, r0
 	ldr r0, [r1]
-	b @080022EA
+	b _080022EA
 	.pool
-@080022E8:
+_080022E8:
 	movs r0, 0
-@080022EA:
+_080022EA:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -2147,13 +2147,13 @@ CopyToBgTilemapBuffer: ; 80022F0
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @08002358
+	bne _08002358
 	adds r0, r4, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne @08002358
+	bne _08002358
 	cmp r6, 0
-	beq @08002340
+	beq _08002340
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
@@ -2164,9 +2164,9 @@ CopyToBgTilemapBuffer: ; 80022F0
 	lsrs r2, r7, 17
 	mov r0, r10
 	bl CpuSet
-	b @08002358
+	b _08002358
 	.pool
-@08002340:
+_08002340:
 	ldr r0, =0x030008f8
 	mov r2, r9
 	lsls r1, r2, 4
@@ -2178,7 +2178,7 @@ CopyToBgTilemapBuffer: ; 80022F0
 	adds r1, r0
 	mov r0, r10
 	bl LZ77UnCompWram
-@08002358:
+_08002358:
 	pop {r3-r5}
 	mov r8, r3
 	mov r9, r4
@@ -2199,33 +2199,33 @@ CopyBgTilemapBufferToVram: ; 800236C
 	adds r0, r4, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @080023C8
+	bne _080023C8
 	adds r0, r4, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne @080023C8
+	bne _080023C8
 	adds r0, r4, 0
 	bl GetBgType
 	cmp r0, 0
-	beq @0800239A
+	beq _0800239A
 	cmp r0, 0x1
-	beq @080023A6
+	beq _080023A6
 	movs r2, 0
-	b @080023B2
-@0800239A:
+	b _080023B2
+_0800239A:
 	adds r0, r4, 0
 	movs r1, 0
 	bl GetBgMetricTextMode
 	lsls r0, 27
-	b @080023B0
-@080023A6:
+	b _080023B0
+_080023A6:
 	adds r0, r4, 0
 	movs r1, 0
 	bl GetBgMetricAffineMode
 	lsls r0, 24
-@080023B0:
+_080023B0:
 	lsrs r2, r0, 16
-@080023B2:
+_080023B2:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
@@ -2236,7 +2236,7 @@ CopyBgTilemapBufferToVram: ; 800236C
 	adds r0, r4, 0
 	movs r3, 0
 	bl LoadBgVram
-@080023C8:
+_080023C8:
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
@@ -2271,41 +2271,41 @@ CopyToBgTilemapBufferRect: ; 80023D4
 	adds r0, r5, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @080024C4
+	bne _080024C4
 	adds r0, r5, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne @080024C4
+	bne _080024C4
 	adds r0, r5, 0
 	bl GetBgType
 	cmp r0, 0
-	beq @08002422
+	beq _08002422
 	cmp r0, 0x1
-	beq @08002470
-	b @080024C4
-@08002422:
+	beq _08002470
+	b _080024C4
+_08002422:
 	mov r4, r8
 	adds r3, r7, 0
 	adds r0, r3, r6
 	cmp r3, r0
-	bge @080024C4
+	bge _080024C4
 	mov r12, r0
 	lsls r1, r5, 4
 	ldr r0, =0x030008fc
 	adds r1, r0
 	mov r8, r1
-@08002436:
+_08002436:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r7, r3, 0x1
 	cmp r2, r0
-	bge @08002460
+	bge _08002460
 	mov r1, r8
 	ldr r6, [r1]
 	lsls r5, r3, 5
 	adds r3, r0, 0
-@0800244A:
+_0800244A:
 	adds r0, r5, r2
 	lsls r0, 1
 	adds r0, r6
@@ -2316,15 +2316,15 @@ CopyToBgTilemapBufferRect: ; 80023D4
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r3
-	blt @0800244A
-@08002460:
+	blt _0800244A
+_08002460:
 	lsls r0, r7, 16
 	lsrs r3, r0, 16
 	cmp r3, r12
-	blt @08002436
-	b @080024C4
+	blt _08002436
+	b _080024C4
 	.pool
-@08002470:
+_08002470:
 	mov r4, r8
 	adds r0, r5, 0
 	movs r1, 0x1
@@ -2335,24 +2335,24 @@ CopyToBgTilemapBufferRect: ; 80023D4
 	adds r3, r7, 0
 	adds r0, r3, r6
 	cmp r3, r0
-	bge @080024C4
+	bge _080024C4
 	mov r12, r0
 	lsls r5, 4
 	mov r8, r5
-@0800248E:
+_0800248E:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r7, r3, 0x1
 	cmp r2, r0
-	bge @080024BC
+	bge _080024BC
 	ldr r6, =0x030008fc
 	add r6, r8
 	ldr r1, [sp]
 	adds r5, r3, 0
 	muls r5, r1
 	adds r3, r0, 0
-@080024A6:
+_080024A6:
 	ldr r1, [r6]
 	adds r0, r5, r2
 	adds r1, r0
@@ -2363,13 +2363,13 @@ CopyToBgTilemapBufferRect: ; 80023D4
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r3
-	blt @080024A6
-@080024BC:
+	blt _080024A6
+_080024BC:
 	lsls r0, r7, 16
 	lsrs r3, r0, 16
 	cmp r3, r12
-	blt @0800248E
-@080024C4:
+	blt _0800248E
+_080024C4:
 	add sp, 0x4
 	pop {r3-r5}
 	mov r8, r3
@@ -2478,15 +2478,15 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	ldr r0, [sp, 0x4]
 	bl IsInvalidBg_
 	cmp r0, 0
-	beq @08002592
-	b @080026EE
-@08002592:
+	beq _08002592
+	b _080026EE
+_08002592:
 	ldr r0, [sp, 0x4]
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	beq @0800259E
-	b @080026EE
-@0800259E:
+	beq _0800259E
+	b _080026EE
+_0800259E:
 	ldr r0, [sp, 0x4]
 	movs r1, 0x4
 	bl GetBgControlAttribute
@@ -2508,11 +2508,11 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	ldr r0, [sp, 0x4]
 	bl GetBgType
 	cmp r0, 0
-	beq @080025D8
+	beq _080025D8
 	cmp r0, 0x1
-	beq @08002674
-	b @080026EE
-@080025D8:
+	beq _08002674
+	b _080026EE
+_080025D8:
 	ldr r1, [sp, 0x10]
 	adds r0, r1, 0
 	muls r0, r7
@@ -2523,21 +2523,21 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	adds r6, r1, r0
 	adds r0, r5, r4
 	cmp r5, r0
-	blt @080025F0
-	b @080026EE
-@080025F0:
+	blt _080025F0
+	b _080026EE
+_080025F0:
 	ldr r2, [sp, 0x18]
 	subs r2, r7, r2
 	str r2, [sp, 0x34]
 	str r0, [sp, 0x38]
-@080025F8:
+_080025F8:
 	ldr r4, [sp, 0x14]
 	ldr r7, [sp, 0x18]
 	adds r0, r4, r7
 	adds r1, r5, 0x1
 	str r1, [sp, 0x3C]
 	cmp r4, r0
-	bge @0800265A
+	bge _0800265A
 	ldr r2, [sp, 0x4]
 	lsls r0, r2, 4
 	ldr r1, =0x030008fc
@@ -2550,7 +2550,7 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	lsls r0, r1, 16
 	asrs r0, 16
 	mov r8, r0
-@0800261E:
+_0800261E:
 	ldr r2, [sp, 0x2C]
 	str r2, [sp]
 	adds r0, r4, 0
@@ -2578,8 +2578,8 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	ldr r2, [sp, 0x18]
 	adds r0, r1, r2
 	cmp r4, r0
-	blt @0800261E
-@0800265A:
+	blt _0800261E
+_0800265A:
 	ldr r5, [sp, 0x34]
 	lsls r0, r5, 1
 	adds r6, r0
@@ -2588,10 +2588,10 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	lsrs r5, r0, 16
 	ldr r0, [sp, 0x38]
 	cmp r5, r0
-	blt @080025F8
-	b @080026EE
+	blt _080025F8
+	b _080026EE
 	.pool
-@08002674:
+_08002674:
 	ldr r1, [sp, 0x10]
 	adds r0, r1, 0
 	muls r0, r7
@@ -2607,7 +2607,7 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	mov r9, r0
 	adds r0, r5, r4
 	cmp r5, r0
-	bge @080026EE
+	bge _080026EE
 	ldr r2, [sp, 0x18]
 	subs r2, r7, r2
 	str r2, [sp, 0x34]
@@ -2617,21 +2617,21 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	ldr r0, [sp, 0x4]
 	lsls r0, 4
 	mov r8, r0
-@080026A8:
+_080026A8:
 	ldr r4, [sp, 0x14]
 	ldr r1, [sp, 0x18]
 	adds r0, r4, r1
 	adds r2, r5, 0x1
 	str r2, [sp, 0x3C]
 	cmp r4, r0
-	bge @080026DE
+	bge _080026DE
 	mov r3, r8
 	add r3, r10
 	mov r7, r9
 	muls r7, r5
 	mov r12, r7
 	adds r2, r0, 0
-@080026C2:
+_080026C2:
 	ldr r1, [r3]
 	mov r5, r12
 	adds r0, r5, r4
@@ -2645,8 +2645,8 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, r2
-	blt @080026C2
-@080026DE:
+	blt _080026C2
+_080026DE:
 	ldr r0, [sp, 0x34]
 	adds r6, r0
 	ldr r1, [sp, 0x3C]
@@ -2654,8 +2654,8 @@ CopyRectToBgTilemapBufferRect: ; 800251C
 	lsrs r5, r0, 16
 	ldr r2, [sp, 0x38]
 	cmp r5, r2
-	blt @080026A8
-@080026EE:
+	blt _080026A8
+_080026EE:
 	add sp, 0x40
 	pop {r3-r5}
 	mov r8, r3
@@ -2696,40 +2696,40 @@ FillBgTilemapBufferRect_Palette0: ; 8002704
 	adds r0, r6, 0
 	bl IsInvalidBg_
 	cmp r0, 0
-	bne @080027F0
+	bne _080027F0
 	adds r0, r6, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne @080027F0
+	bne _080027F0
 	adds r0, r6, 0
 	bl GetBgType
 	cmp r0, 0
-	beq @08002756
+	beq _08002756
 	cmp r0, 0x1
-	beq @080027A0
-	b @080027F0
-@08002756:
+	beq _080027A0
+	b _080027F0
+_08002756:
 	adds r3, r7, 0
 	adds r5, r3, r5
 	cmp r3, r5
-	bge @080027F0
+	bge _080027F0
 	adds r7, r5, 0
 	lsls r1, r6, 4
 	ldr r0, =0x030008fc
 	adds r1, r0
 	mov r12, r1
-@08002768:
+_08002768:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r6, r3, 0x1
 	cmp r2, r0
-	bge @08002790
+	bge _08002790
 	mov r5, r12
 	ldr r4, [r5]
 	lsls r3, 5
 	adds r1, r0, 0
-@0800277C:
+_0800277C:
 	adds r0, r3, r2
 	lsls r0, 1
 	adds r0, r4
@@ -2739,15 +2739,15 @@ FillBgTilemapBufferRect_Palette0: ; 8002704
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r1
-	blt @0800277C
-@08002790:
+	blt _0800277C
+_08002790:
 	lsls r0, r6, 16
 	lsrs r3, r0, 16
 	cmp r3, r7
-	blt @08002768
-	b @080027F0
+	blt _08002768
+	b _080027F0
 	.pool
-@080027A0:
+_080027A0:
 	adds r0, r6, 0
 	movs r1, 0x1
 	bl GetBgMetricAffineMode
@@ -2757,24 +2757,24 @@ FillBgTilemapBufferRect_Palette0: ; 8002704
 	adds r3, r7, 0
 	adds r5, r3, r5
 	cmp r3, r5
-	bge @080027F0
+	bge _080027F0
 	adds r7, r5, 0
 	lsls r6, 4
 	mov r12, r6
-@080027BC:
+_080027BC:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r6, r3, 0x1
 	cmp r2, r0
-	bge @080027E8
+	bge _080027E8
 	ldr r5, =0x030008fc
 	add r5, r12
 	ldr r1, [sp]
 	adds r4, r3, 0
 	muls r4, r1
 	adds r3, r0, 0
-@080027D4:
+_080027D4:
 	ldr r0, [r5]
 	adds r1, r4, r2
 	adds r0, r1
@@ -2784,13 +2784,13 @@ FillBgTilemapBufferRect_Palette0: ; 8002704
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r3
-	blt @080027D4
-@080027E8:
+	blt _080027D4
+_080027E8:
 	lsls r0, r6, 16
 	lsrs r3, r0, 16
 	cmp r3, r7
-	blt @080027BC
-@080027F0:
+	blt _080027BC
+_080027F0:
 	add sp, 0x4
 	pop {r3-r5}
 	mov r8, r3
@@ -2875,15 +2875,15 @@ WriteSequenceToBgTilemapBuffer: ; 8002840
 	mov r0, r9
 	bl IsInvalidBg_
 	cmp r0, 0
-	beq @0800288E
-	b @080029D4
-@0800288E:
+	beq _0800288E
+	b _080029D4
+_0800288E:
 	mov r0, r9
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	beq @0800289A
-	b @080029D4
-@0800289A:
+	beq _0800289A
+	b _080029D4
+_0800289A:
 	mov r0, r9
 	movs r1, 0x4
 	bl GetBgControlAttribute
@@ -2905,30 +2905,30 @@ WriteSequenceToBgTilemapBuffer: ; 8002840
 	mov r0, r9
 	bl GetBgType
 	cmp r0, 0
-	beq @080028D4
+	beq _080028D4
 	cmp r0, 0x1
-	beq @0800295C
-	b @080029D4
-@080028D4:
+	beq _0800295C
+	b _080029D4
+_080028D4:
 	adds r5, r7, 0
 	adds r0, r5, r4
 	cmp r5, r0
-	bge @080029D4
+	bge _080029D4
 	str r0, [sp, 0x24]
 	add r7, sp, 0x4
-@080028E0:
+_080028E0:
 	ldr r4, [sp, 0x8]
 	mov r1, r10
 	adds r0, r4, r1
 	adds r2, r5, 0x1
 	mov r8, r2
 	cmp r4, r0
-	bge @08002944
+	bge _08002944
 	mov r3, r9
 	lsls r1, r3, 4
 	ldr r0, =0x030008fc
 	adds r6, r1, r0
-@080028F6:
+_080028F6:
 	ldr r0, [sp, 0x18]
 	str r0, [sp]
 	adds r0, r4, 0
@@ -2965,17 +2965,17 @@ WriteSequenceToBgTilemapBuffer: ; 8002840
 	ldr r0, [sp, 0x8]
 	add r0, r10
 	cmp r4, r0
-	blt @080028F6
-@08002944:
+	blt _080028F6
+_08002944:
 	mov r1, r8
 	lsls r0, r1, 16
 	lsrs r5, r0, 16
 	ldr r2, [sp, 0x24]
 	cmp r5, r2
-	blt @080028E0
-	b @080029D4
+	blt _080028E0
+	b _080029D4
 	.pool
-@0800295C:
+_0800295C:
 	mov r0, r9
 	movs r1, 0x1
 	bl GetBgMetricAffineMode
@@ -2985,19 +2985,19 @@ WriteSequenceToBgTilemapBuffer: ; 8002840
 	adds r5, r7, 0
 	adds r0, r5, r4
 	cmp r5, r0
-	bge @080029D4
+	bge _080029D4
 	str r0, [sp, 0x24]
 	mov r3, r9
 	lsls r3, 4
 	mov r12, r3
-@0800297A:
+_0800297A:
 	ldr r4, [sp, 0x8]
 	mov r7, r10
 	adds r0, r4, r7
 	adds r1, r5, 0x1
 	mov r8, r1
 	cmp r4, r0
-	bge @080029C8
+	bge _080029C8
 	ldr r2, =0x030008fc
 	add r2, r12
 	str r2, [sp, 0x28]
@@ -3011,7 +3011,7 @@ WriteSequenceToBgTilemapBuffer: ; 8002840
 	ldr r7, =0x000003ff
 	adds r5, r7, 0
 	adds r6, r0, 0
-@080029A2:
+_080029A2:
 	ldr r0, [sp, 0x28]
 	ldr r1, [r0]
 	adds r0, r3, r4
@@ -3030,15 +3030,15 @@ WriteSequenceToBgTilemapBuffer: ; 8002840
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, r6
-	blt @080029A2
-@080029C8:
+	blt _080029A2
+_080029C8:
 	mov r1, r8
 	lsls r0, r1, 16
 	lsrs r5, r0, 16
 	ldr r2, [sp, 0x24]
 	cmp r5, r2
-	blt @0800297A
-@080029D4:
+	blt _0800297A
+_080029D4:
 	add sp, 0x2C
 	pop {r3-r5}
 	mov r8, r3
@@ -3064,57 +3064,57 @@ GetBgMetricTextMode: ; 80029EC
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq @08002A2C
+	beq _08002A2C
 	cmp r4, 0x1
-	bgt @08002A10
+	bgt _08002A10
 	cmp r4, 0
-	beq @08002A16
-	b @08002A52
-@08002A10:
+	beq _08002A16
+	b _08002A52
+_08002A10:
 	cmp r5, 0x2
-	beq @08002A3E
-	b @08002A52
-@08002A16:
+	beq _08002A3E
+	b _08002A52
+_08002A16:
 	cmp r0, 0x2
-	bgt @08002A24
+	bgt _08002A24
 	cmp r0, 0x1
-	bge @08002A4E
-@08002A1E:
+	bge _08002A4E
+_08002A1E:
 	cmp r0, 0
-	beq @08002A46
-	b @08002A52
-@08002A24:
+	beq _08002A46
+	b _08002A52
+_08002A24:
 	cmp r0, 0x3
-	bne @08002A52
+	bne _08002A52
 	movs r0, 0x4
-	b @08002A54
-@08002A2C:
+	b _08002A54
+_08002A2C:
 	cmp r0, 0x1
-	beq @08002A4E
+	beq _08002A4E
 	cmp r0, 0x1
-	ble @08002A1E
+	ble _08002A1E
 	cmp r0, 0x2
-	beq @08002A46
+	beq _08002A46
 	cmp r0, 0x3
-	bne @08002A52
-	b @08002A4E
-@08002A3E:
+	bne _08002A52
+	b _08002A4E
+_08002A3E:
 	cmp r0, 0
-	blt @08002A52
+	blt _08002A52
 	cmp r0, 0x1
-	bgt @08002A4A
-@08002A46:
+	bgt _08002A4A
+_08002A46:
 	movs r0, 0x1
-	b @08002A54
-@08002A4A:
+	b _08002A54
+_08002A4A:
 	cmp r0, 0x3
-	bgt @08002A52
-@08002A4E:
+	bgt _08002A52
+_08002A4E:
 	movs r0, 0x2
-	b @08002A54
-@08002A52:
+	b _08002A54
+_08002A52:
 	movs r0, 0
-@08002A54:
+_08002A54:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
@@ -3134,43 +3134,43 @@ GetBgMetricAffineMode: ; 8002A5C
 	lsrs r1, r0, 24
 	adds r0, r1, 0
 	cmp r4, 0
-	beq @08002A84
+	beq _08002A84
 	cmp r4, 0
-	blt @08002AAC
+	blt _08002AAC
 	cmp r4, 0x2
-	bgt @08002AAC
+	bgt _08002AAC
 	movs r0, 0x10
 	lsls r0, r1
-	b @08002AAE
-@08002A84:
+	b _08002AAE
+_08002A84:
 	cmp r1, 0x1
-	beq @08002AA0
+	beq _08002AA0
 	cmp r1, 0x1
-	bgt @08002A92
+	bgt _08002A92
 	cmp r1, 0
-	beq @08002A9C
-	b @08002AAC
-@08002A92:
+	beq _08002A9C
+	b _08002AAC
+_08002A92:
 	cmp r0, 0x2
-	beq @08002AA4
+	beq _08002AA4
 	cmp r0, 0x3
-	beq @08002AA8
-	b @08002AAC
-@08002A9C:
+	beq _08002AA8
+	b _08002AAC
+_08002A9C:
 	movs r0, 0x1
-	b @08002AAE
-@08002AA0:
+	b _08002AAE
+_08002AA0:
 	movs r0, 0x4
-	b @08002AAE
-@08002AA4:
+	b _08002AAE
+_08002AA4:
 	movs r0, 0x10
-	b @08002AAE
-@08002AA8:
+	b _08002AAE
+_08002AA8:
 	movs r0, 0x40
-	b @08002AAE
-@08002AAC:
+	b _08002AAE
+_08002AAC:
 	movs r0, 0
-@08002AAE:
+_08002AAE:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -3187,22 +3187,22 @@ GetTileMapIndexFromCoords: ; 8002AB4
 	subs r0, 0x1
 	ands r1, r0
 	cmp r2, 0x1
-	beq @08002AD8
+	beq _08002AD8
 	cmp r2, 0x1
-	ble @08002AE0
+	ble _08002AE0
 	cmp r2, 0x2
-	beq @08002AE0
+	beq _08002AE0
 	cmp r2, 0x3
-	bne @08002AE0
+	bne _08002AE0
 	cmp r1, 0x1F
-	ble @08002AD8
+	ble _08002AD8
 	adds r1, 0x20
-@08002AD8:
+_08002AD8:
 	cmp r4, 0x1F
-	ble @08002AE0
+	ble _08002AE0
 	subs r4, 0x20
 	adds r1, 0x20
-@08002AE0:
+_08002AE0:
 	lsls r0, r1, 5
 	adds r0, r4
 	pop {r4}
@@ -3218,11 +3218,11 @@ CopyTileMapEntry: ; 8002AEC
 	adds r6, r1, 0
 	ldr r5, [sp, 0x10]
 	cmp r2, 0x10
-	beq @08002B14
+	beq _08002B14
 	cmp r2, 0x10
-	bgt @08002B34
+	bgt _08002B34
 	cmp r2, 0
-	blt @08002B34
+	blt _08002B34
 	ldrh r0, [r4]
 	adds r0, r3
 	ldr r3, =0x00000fff
@@ -3230,9 +3230,9 @@ CopyTileMapEntry: ; 8002AEC
 	ands r0, r1
 	adds r1, r2, r5
 	lsls r1, 12
-	b @08002B3A
+	b _08002B3A
 	.pool
-@08002B14:
+_08002B14:
 	ldrh r1, [r6]
 	movs r0, 0xFC
 	lsls r0, 8
@@ -3245,15 +3245,15 @@ CopyTileMapEntry: ; 8002AEC
 	adds r1, r3, 0
 	ands r0, r1
 	orrs r0, r2
-	b @08002B3C
+	b _08002B3C
 	.pool
-@08002B34:
+_08002B34:
 	ldrh r0, [r4]
 	adds r0, r3
 	lsls r1, r5, 12
-@08002B3A:
+_08002B3A:
 	adds r0, r1
-@08002B3C:
+_08002B3C:
 	lsls r0, 16
 	lsrs r1, r0, 16
 	strh r1, [r6]
@@ -3273,40 +3273,40 @@ GetBgType: ; 8002B48
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x2
-	beq @08002B76
+	beq _08002B76
 	cmp r4, 0x2
-	ble @08002B66
+	ble _08002B66
 	cmp r4, 0x3
-	beq @08002B86
-	b @08002B8E
-@08002B66:
+	beq _08002B86
+	b _08002B8E
+_08002B66:
 	cmp r5, 0
-	blt @08002B8E
+	blt _08002B8E
 	cmp r0, 0x1
-	bgt @08002B8E
+	bgt _08002B8E
 	cmp r0, 0
-	blt @08002B8E
-@08002B72:
+	blt _08002B8E
+_08002B72:
 	movs r0, 0
-	b @08002B90
-@08002B76:
+	b _08002B90
+_08002B76:
 	cmp r0, 0
-	beq @08002B72
+	beq _08002B72
 	cmp r0, 0
-	blt @08002B8E
+	blt _08002B8E
 	cmp r0, 0x2
-	bgt @08002B8E
-@08002B82:
+	bgt _08002B8E
+_08002B82:
 	movs r0, 0x1
-	b @08002B90
-@08002B86:
+	b _08002B90
+_08002B86:
 	cmp r0, 0
-	beq @08002B72
+	beq _08002B72
 	cmp r0, 0x2
-	beq @08002B82
-@08002B8E:
+	beq _08002B82
+_08002B8E:
 	ldr r0, =0x0000ffff
-@08002B90:
+_08002B90:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
@@ -3320,12 +3320,12 @@ IsInvalidBg_: ; 8002B9C
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
-	bhi @08002BAA
+	bhi _08002BAA
 	movs r0, 0
-	b @08002BAC
-@08002BAA:
+	b _08002BAC
+_08002BAA:
 	movs r0, 0x1
-@08002BAC:
+_08002BAC:
 	pop {r1}
 	bx r1
 	thumb_func_end IsInvalidBg_
@@ -3342,15 +3342,15 @@ IsTileMapOutsideWram: ; 8002BB0
 	ldr r1, [r0]
 	ldr r0, =0x03008000
 	cmp r1, r0
-	bhi @08002BD4
+	bhi _08002BD4
 	cmp r1, 0
-	beq @08002BD4
+	beq _08002BD4
 	movs r0, 0
-	b @08002BD6
+	b _08002BD6
 	.pool
-@08002BD4:
+_08002BD4:
 	movs r0, 0x1
-@08002BD6:
+_08002BD6:
 	pop {r1}
 	bx r1
 	thumb_func_end IsTileMapOutsideWram