get rid of @ local labels

1 files changed, 90 insertions, 90 deletions

diff --git a/asm/pixel_buffer.s b/asm/pixel_buffer.s
index 7f866010c..d353a1d20 100644
--- a/asm/pixel_buffer.s
+++ b/asm/pixel_buffer.s
@@ -77,11 +77,11 @@ BlitBitmapRect4Bit: ; 8002C20
 	adds r2, r4
 	mov r8, r2
 	cmp r0, r4
-	bge @08002C74
+	bge _08002C74
 	ldr r2, [sp, 0x8]
 	adds r0, r2
 	mov r8, r0
-@08002C74:
+_08002C74:
 	ldr r4, [sp, 0x4]
 	ldrh r0, [r4, 0x6]
 	mov r1, r9
@@ -89,10 +89,10 @@ BlitBitmapRect4Bit: ; 8002C20
 	adds r2, r5, r7
 	str r2, [sp, 0x14]
 	cmp r0, r5
-	bge @08002C88
+	bge _08002C88
 	adds r0, r7
 	str r0, [sp, 0x14]
-@08002C88:
+_08002C88:
 	ldr r4, [sp]
 	ldrh r1, [r4, 0x4]
 	movs r2, 0x7
@@ -108,14 +108,14 @@ BlitBitmapRect4Bit: ; 8002C20
 	str r0, [sp, 0x1C]
 	ldr r0, [sp, 0x10]
 	cmp r0, 0xFF
-	bne @08002D46
+	bne _08002D46
 	adds r3, r7, 0
 	mov r1, r9
 	ldr r2, [sp, 0x14]
 	cmp r3, r2
-	blt @08002CB4
-	b @08002DEE
-@08002CB4:
+	blt _08002CB4
+	b _08002DEE
+_08002CB4:
 	ldr r5, [sp, 0x8]
 	ldr r6, [sp, 0xC]
 	adds r4, r3, 0x1
@@ -123,7 +123,7 @@ BlitBitmapRect4Bit: ; 8002C20
 	adds r0, r1, 0x1
 	str r0, [sp, 0x28]
 	cmp r5, r8
-	bge @08002D3A
+	bge _08002D3A
 	movs r7, 0x3
 	asrs r0, r3, 3
 	ldr r2, [sp, 0x18]
@@ -140,7 +140,7 @@ BlitBitmapRect4Bit: ; 8002C20
 	mov r12, r0
 	lsls r0, r1, 29
 	lsrs r3, r0, 27
-@08002CE4:
+_08002CE4:
 	asrs r0, r5, 1
 	ands r0, r7
 	ldr r2, [sp]
@@ -183,21 +183,21 @@ BlitBitmapRect4Bit: ; 8002C20
 	adds r5, 0x1
 	adds r6, 0x1
 	cmp r5, r8
-	blt @08002CE4
-@08002D3A:
+	blt _08002CE4
+_08002D3A:
 	ldr r3, [sp, 0x24]
 	ldr r1, [sp, 0x28]
 	ldr r2, [sp, 0x14]
 	cmp r3, r2
-	blt @08002CB4
-	b @08002DEE
-@08002D46:
+	blt _08002CB4
+	b _08002DEE
+_08002D46:
 	adds r3, r7, 0
 	mov r1, r9
 	ldr r4, [sp, 0x14]
 	cmp r3, r4
-	bge @08002DEE
-@08002D50:
+	bge _08002DEE
+_08002D50:
 	ldr r5, [sp, 0x8]
 	ldr r6, [sp, 0xC]
 	adds r0, r3, 0x1
@@ -205,7 +205,7 @@ BlitBitmapRect4Bit: ; 8002C20
 	adds r2, r1, 0x1
 	str r2, [sp, 0x28]
 	cmp r5, r8
-	bge @08002DE4
+	bge _08002DE4
 	movs r4, 0x3
 	mov r9, r4
 	asrs r0, r3, 3
@@ -224,7 +224,7 @@ BlitBitmapRect4Bit: ; 8002C20
 	mov r12, r0
 	lsls r0, r1, 29
 	lsrs r7, r0, 27
-@08002D84:
+_08002D84:
 	asrs r0, r5, 1
 	mov r1, r9
 	ands r0, r1
@@ -258,7 +258,7 @@ BlitBitmapRect4Bit: ; 8002C20
 	ands r2, r0
 	ldr r0, [sp, 0x10]
 	cmp r2, r0
-	beq @08002DDC
+	beq _08002DDC
 	adds r0, r6, 0
 	ands r0, r3
 	lsls r1, r0, 2
@@ -269,18 +269,18 @@ BlitBitmapRect4Bit: ; 8002C20
 	ands r0, r1
 	orrs r2, r0
 	strb r2, [r4]
-@08002DDC:
+_08002DDC:
 	adds r5, 0x1
 	adds r6, 0x1
 	cmp r5, r8
-	blt @08002D84
-@08002DE4:
+	blt _08002D84
+_08002DE4:
 	ldr r3, [sp, 0x24]
 	ldr r1, [sp, 0x28]
 	ldr r2, [sp, 0x14]
 	cmp r3, r2
-	blt @08002D50
-@08002DEE:
+	blt _08002D50
+_08002DEE:
 	add sp, 0x2C
 	pop {r3-r5}
 	mov r8, r3
@@ -319,17 +319,17 @@ FillBitmapRect4Bit: ; 8002E00
 	mov r3, r9
 	ldrh r1, [r3, 0x4]
 	cmp r4, r1
-	ble @08002E36
+	ble _08002E36
 	adds r4, r1, 0
-@08002E36:
+_08002E36:
 	adds r2, r0
 	mov r12, r2
 	mov r2, r9
 	ldrh r0, [r2, 0x6]
 	cmp r12, r0
-	ble @08002E44
+	ble _08002E44
 	mov r12, r0
-@08002E44:
+_08002E44:
 	movs r0, 0x7
 	ands r0, r1
 	adds r0, r1, r0
@@ -345,19 +345,19 @@ FillBitmapRect4Bit: ; 8002E00
 	mov r10, r0
 	adds r1, r6, 0
 	cmp r1, r12
-	bge @08002EB6
-@08002E64:
+	bge _08002EB6
+_08002E64:
 	ldr r3, [sp]
 	adds r7, r1, 0x1
 	cmp r3, r4
-	bge @08002EB0
+	bge _08002EB0
 	asrs r0, r1, 3
 	ldr r2, [sp, 0x4]
 	muls r0, r2
 	lsls r6, r0, 5
 	lsls r0, r1, 29
 	lsrs r5, r0, 27
-@08002E78:
+_08002E78:
 	asrs r2, r3, 1
 	movs r0, 0x3
 	ands r2, r0
@@ -371,28 +371,28 @@ FillBitmapRect4Bit: ; 8002E00
 	adds r2, r1, r5
 	lsls r0, r3, 31
 	cmp r0, 0
-	beq @08002E9E
+	beq _08002E9E
 	ldrb r1, [r2]
 	movs r0, 0xF
 	ands r0, r1
 	mov r1, r8
-	b @08002EA6
-@08002E9E:
+	b _08002EA6
+_08002E9E:
 	ldrb r1, [r2]
 	movs r0, 0xF0
 	ands r0, r1
 	mov r1, r10
-@08002EA6:
+_08002EA6:
 	orrs r0, r1
 	strb r0, [r2]
 	adds r3, 0x1
 	cmp r3, r4
-	blt @08002E78
-@08002EB0:
+	blt _08002E78
+_08002EB0:
 	adds r1, r7, 0
 	cmp r1, r12
-	blt @08002E64
-@08002EB6:
+	blt _08002E64
+_08002EB6:
 	add sp, 0x8
 	pop {r3-r5}
 	mov r8, r3
@@ -453,24 +453,24 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	adds r1, r5, r1
 	str r1, [sp, 0x18]
 	cmp r0, r5
-	bge @08002F2E
+	bge _08002F2E
 	ldr r2, [sp, 0x8]
 	adds r0, r2
 	str r0, [sp, 0x18]
-@08002F2E:
+_08002F2E:
 	ldr r5, [sp, 0x4]
 	ldrh r1, [r5, 0x6]
 	subs r0, r1, r7
 	cmp r0, r4
-	bge @08002F40
+	bge _08002F40
 	adds r0, r3, r1
 	subs r0, r7
 	str r0, [sp, 0x1C]
-	b @08002F44
-@08002F40:
+	b _08002F44
+_08002F40:
 	adds r4, r3, r4
 	str r4, [sp, 0x1C]
-@08002F44:
+_08002F44:
 	ldr r0, [sp]
 	ldrh r1, [r0, 0x4]
 	movs r2, 0x7
@@ -488,14 +488,14 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	str r1, [sp, 0x24]
 	ldr r0, [sp, 0x10]
 	cmp r0, 0xFF
-	bne @08003024
+	bne _08003024
 	adds r2, r3, 0
 	adds r5, r7, 0
 	ldr r1, [sp, 0x1C]
 	cmp r2, r1
-	blt @08002F74
-	b @08003106
-@08002F74:
+	blt _08002F74
+	b _08003106
+_08002F74:
 	ldr r3, [sp, 0x8]
 	lsrs r3, 1
 	str r3, [sp, 0x2C]
@@ -506,7 +506,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	lsrs r0, r7, 3
 	lsls r0, 5
 	str r0, [sp, 0x30]
-@08002F88:
+_08002F88:
 	ldr r0, [sp]
 	ldr r1, [r0]
 	ldr r3, [sp, 0x2C]
@@ -530,7 +530,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	str r0, [sp, 0x38]
 	ldr r1, [sp, 0x18]
 	cmp r3, r1
-	bge @08003018
+	bge _08003018
 	asrs r0, r5, 3
 	ldr r2, [sp, 0x24]
 	muls r0, r2
@@ -539,7 +539,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	lsls r0, r5, 29
 	lsrs r0, 26
 	mov r9, r0
-@08002FC8:
+_08002FC8:
 	movs r0, 0x7
 	ands r0, r4
 	ldr r5, [sp, 0x4]
@@ -554,11 +554,11 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	movs r0, 0x1
 	ands r0, r3
 	cmp r0, 0
-	beq @08002FEC
+	beq _08002FEC
 	ldrb r0, [r6]
 	lsrs r0, 4
-	b @08003008
-@08002FEC:
+	b _08003008
+_08002FEC:
 	asrs r2, r3, 1
 	movs r0, 0x3
 	ands r2, r0
@@ -573,7 +573,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	ldrb r1, [r6]
 	movs r0, 0xF
 	ands r0, r1
-@08003008:
+_08003008:
 	ldr r1, [sp, 0x14]
 	adds r0, r1, r0
 	strb r0, [r5]
@@ -581,20 +581,20 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	adds r4, 0x1
 	ldr r2, [sp, 0x18]
 	cmp r3, r2
-	blt @08002FC8
-@08003018:
+	blt _08002FC8
+_08003018:
 	mov r2, r10
 	ldr r5, [sp, 0x38]
 	ldr r3, [sp, 0x1C]
 	cmp r2, r3
-	blt @08002F88
-	b @08003106
-@08003024:
+	blt _08002F88
+	b _08003106
+_08003024:
 	adds r2, r3, 0
 	adds r5, r7, 0
 	ldr r7, [sp, 0x1C]
 	cmp r2, r7
-	bge @08003106
+	bge _08003106
 	ldr r0, [sp, 0x8]
 	lsrs r0, 1
 	str r0, [sp, 0x34]
@@ -602,7 +602,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	ldr r1, [sp, 0x34]
 	ands r1, r0
 	str r1, [sp, 0x34]
-@0800303C:
+_0800303C:
 	ldr r3, [sp]
 	ldr r1, [r3]
 	ldr r7, [sp, 0x34]
@@ -627,7 +627,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	str r0, [sp, 0x38]
 	ldr r1, [sp, 0x18]
 	cmp r3, r1
-	bge @080030FC
+	bge _080030FC
 	asrs r0, r5, 3
 	ldr r2, [sp, 0x24]
 	muls r0, r2
@@ -636,17 +636,17 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	lsls r0, r5, 29
 	lsrs r0, 26
 	mov r12, r0
-@0800307E:
+_0800307E:
 	movs r0, 0x1
 	ands r0, r3
 	cmp r0, 0
-	beq @080030B2
+	beq _080030B2
 	ldrb r2, [r6]
 	movs r0, 0xF0
 	ands r0, r2
 	ldr r5, [sp, 0x28]
 	cmp r0, r5
-	beq @080030F2
+	beq _080030F2
 	adds r0, r4, 0
 	movs r1, 0x7
 	ands r0, r1
@@ -662,8 +662,8 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	lsrs r0, r2, 4
 	ldr r1, [sp, 0x14]
 	adds r0, r1, r0
-	b @080030F0
-@080030B2:
+	b _080030F0
+_080030B2:
 	asrs r2, r3, 1
 	movs r0, 0x3
 	ands r2, r0
@@ -680,7 +680,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	ands r2, r0
 	ldr r0, [sp, 0x10]
 	cmp r2, r0
-	beq @080030F2
+	beq _080030F2
 	adds r0, r4, 0
 	movs r1, 0x7
 	ands r0, r1
@@ -695,21 +695,21 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8
 	adds r5, r1, r0
 	ldr r1, [sp, 0x14]
 	adds r0, r1, r2
-@080030F0:
+_080030F0:
 	strb r0, [r5]
-@080030F2:
+_080030F2:
 	adds r3, 0x1
 	adds r4, 0x1
 	ldr r2, [sp, 0x18]
 	cmp r3, r2
-	blt @0800307E
-@080030FC:
+	blt _0800307E
+_080030FC:
 	mov r2, r10
 	ldr r5, [sp, 0x38]
 	ldr r3, [sp, 0x1C]
 	cmp r2, r3
-	blt @0800303C
-@08003106:
+	blt _0800303C
+_08003106:
 	add sp, 0x3C
 	pop {r3-r5}
 	mov r8, r3
@@ -749,16 +749,16 @@ FillBitmapRect8Bit: ; 8003118
 	mov r3, r8
 	ldrh r1, [r3, 0x4]
 	cmp r5, r1
-	ble @08003150
+	ble _08003150
 	adds r5, r1, 0
-@08003150:
+_08003150:
 	adds r7, r2, r0
 	mov r2, r8
 	ldrh r0, [r2, 0x6]
 	cmp r7, r0
-	ble @0800315C
+	ble _0800315C
 	adds r7, r0, 0
-@0800315C:
+_0800315C:
 	movs r0, 0x7
 	ands r0, r1
 	adds r0, r1, r0
@@ -766,13 +766,13 @@ FillBitmapRect8Bit: ; 8003118
 	str r0, [sp]
 	adds r1, r6, 0
 	cmp r1, r7
-	bge @080031AC
-@0800316C:
+	bge _080031AC
+_0800316C:
 	mov r3, r10
 	adds r6, r1, 0x1
 	str r6, [sp, 0x4]
 	cmp r3, r5
-	bge @080031A6
+	bge _080031A6
 	movs r0, 0x7
 	mov r12, r0
 	asrs r0, r1, 3
@@ -781,7 +781,7 @@ FillBitmapRect8Bit: ; 8003118
 	lsls r4, r0, 6
 	lsls r0, r1, 29
 	lsrs r2, r0, 26
-@08003186:
+_08003186:
 	adds r0, r3, 0
 	mov r6, r12
 	ands r0, r6
@@ -797,12 +797,12 @@ FillBitmapRect8Bit: ; 8003118
 	strb r0, [r1]
 	adds r3, 0x1
 	cmp r3, r5
-	blt @08003186
-@080031A6:
+	blt _08003186
+_080031A6:
 	ldr r1, [sp, 0x4]
 	cmp r1, r7
-	blt @0800316C
-@080031AC:
+	blt _0800316C
+_080031AC:
 	add sp, 0x8
 	pop {r3-r5}
 	mov r8, r3