get rid of @ local labels

1 files changed, 65 insertions, 65 deletions

diff --git a/asm/task.s b/asm/task.s
index e44100bba..9deaabd20 100644
--- a/asm/task.s
+++ b/asm/task.s
@@ -6,7 +6,7 @@ clear_tasks: ; 80A8F50
 	ldr r6, =0x03005e00
 	adds r7, r6, 0
 	adds r7, 0x8
-@080A8F5A:
+_080A8F5A:
 	lsls r0, r4, 2
 	adds r0, r4
 	lsls r0, 3
@@ -30,7 +30,7 @@ clear_tasks: ; 80A8F50
 	lsls r4, 24
 	lsrs r4, 24
 	cmp r4, 0xF
-	bls @080A8F5A
+	bls _080A8F5A
 	ldr r0, =0x03005e00
 	movs r1, 0xFE
 	strb r1, [r0, 0x5]
@@ -54,14 +54,14 @@ AddTask: ; 80A8FB0
 	lsrs r1, 24
 	movs r6, 0
 	ldr r7, =0x03005e00
-@080A8FBC:
+_080A8FBC:
 	lsls r0, r6, 2
 	adds r0, r6
 	lsls r5, r0, 3
 	adds r4, r5, r7
 	ldrb r0, [r4, 0x4]
 	cmp r0, 0
-	bne @080A8FF0
+	bne _080A8FF0
 	str r2, [r4]
 	strb r1, [r4, 0x7]
 	adds r0, r6, 0
@@ -75,16 +75,16 @@ AddTask: ; 80A8FB0
 	movs r0, 0x1
 	strb r0, [r4, 0x4]
 	adds r0, r6, 0
-	b @080A8FFC
+	b _080A8FFC
 	.pool
-@080A8FF0:
+_080A8FF0:
 	adds r0, r6, 0x1
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0xF
-	bls @080A8FBC
+	bls _080A8FBC
 	movs r0, 0
-@080A8FFC:
+_080A8FFC:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
@@ -102,7 +102,7 @@ insert_task_in_order_by_priority: ; 80A9004
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0x10
-	bne @080A9034
+	bne _080A9034
 	ldr r1, =0x03005e00
 	lsls r0, r4, 2
 	adds r0, r4
@@ -112,9 +112,9 @@ insert_task_in_order_by_priority: ; 80A9004
 	strb r1, [r0, 0x5]
 	movs r1, 0xFF
 	strb r1, [r0, 0x6]
-	b @080A9090
+	b _080A9090
 	.pool
-@080A9034:
+_080A9034:
 	ldr r6, =0x03005e00
 	lsls r0, r4, 2
 	mov r12, r0
@@ -122,7 +122,7 @@ insert_task_in_order_by_priority: ; 80A9004
 	adds r0, r4
 	lsls r0, 3
 	adds r2, r0, r6
-@080A9042:
+_080A9042:
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r5, r0, 3
@@ -131,30 +131,30 @@ insert_task_in_order_by_priority: ; 80A9004
 	ldrb r0, [r2, 0x7]
 	ldrb r7, [r3, 0x7]
 	cmp r0, r7
-	bcs @080A9074
+	bcs _080A9074
 	ldrb r0, [r3, 0x5]
 	strb r0, [r2, 0x5]
 	strb r1, [r2, 0x6]
 	ldrb r0, [r3, 0x5]
 	cmp r0, 0xFE
-	beq @080A906C
+	beq _080A906C
 	adds r1, r0, 0
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
 	add r0, r8
 	strb r4, [r0, 0x6]
-@080A906C:
+_080A906C:
 	strb r4, [r3, 0x5]
-	b @080A9090
+	b _080A9090
 	.pool
-@080A9074:
+_080A9074:
 	ldrb r0, [r3, 0x6]
 	cmp r0, 0xFF
-	beq @080A907E
+	beq _080A907E
 	adds r1, r0, 0
-	b @080A9042
-@080A907E:
+	b _080A9042
+_080A907E:
 	mov r2, r12
 	adds r0, r2, r4
 	lsls r0, 3
@@ -164,7 +164,7 @@ insert_task_in_order_by_priority: ; 80A9004
 	ldrb r1, [r2, 0x6]
 	strb r1, [r0, 0x6]
 	strb r4, [r2, 0x6]
-@080A9090:
+_080A9090:
 	pop {r3}
 	mov r8, r3
 	pop {r4-r7}
@@ -185,28 +185,28 @@ remove_task: ; 80A909C
 	adds r2, r1, r4
 	ldrb r0, [r2, 0x4]
 	cmp r0, 0
-	beq @080A9106
+	beq _080A9106
 	movs r0, 0
 	strb r0, [r2, 0x4]
 	ldrb r3, [r2, 0x5]
 	cmp r3, 0xFE
-	bne @080A90D4
+	bne _080A90D4
 	ldrb r0, [r2, 0x6]
 	cmp r0, 0xFF
-	beq @080A9106
+	beq _080A9106
 	adds r1, r0, 0
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
 	adds r0, r4
 	strb r3, [r0, 0x5]
-	b @080A9106
+	b _080A9106
 	.pool
-@080A90D4:
+_080A90D4:
 	ldrb r3, [r2, 0x6]
 	adds r0, r3, 0
 	cmp r0, 0xFF
-	bne @080A90EC
+	bne _080A90EC
 	ldrb r0, [r2, 0x5]
 	lsls r1, r0, 2
 	adds r1, r0
@@ -214,8 +214,8 @@ remove_task: ; 80A909C
 	adds r1, r4
 	movs r0, 0xFF
 	strb r0, [r1, 0x6]
-	b @080A9106
-@080A90EC:
+	b _080A9106
+_080A90EC:
 	ldrb r1, [r2, 0x5]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -229,7 +229,7 @@ remove_task: ; 80A909C
 	adds r0, r4
 	ldrb r1, [r2, 0x5]
 	strb r1, [r0, 0x5]
-@080A9106:
+_080A9106:
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -243,9 +243,9 @@ run_active_tasks: ; 80A910C
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x10
-	beq @080A9130
+	beq _080A9130
 	ldr r5, =0x03005e00
-@080A911C:
+_080A911C:
 	lsls r4, r0, 2
 	adds r4, r0
 	lsls r4, 3
@@ -254,8 +254,8 @@ run_active_tasks: ; 80A910C
 	bl _call_via_r1
 	ldrb r0, [r4, 0x6]
 	cmp r0, 0xFF
-	bne @080A911C
-@080A9130:
+	bne _080A911C
+_080A9130:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -271,27 +271,27 @@ get_first_active_task: ; 80A913C
 	ldrb r1, [r0, 0x4]
 	adds r3, r0, 0
 	cmp r1, 0x1
-	bne @080A9150
+	bne _080A9150
 	ldrb r0, [r3, 0x5]
 	cmp r0, 0xFE
-	beq @080A916E
-@080A9150:
+	beq _080A916E
+_080A9150:
 	adds r0, r2, 0x1
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0xF
-	bhi @080A916E
+	bhi _080A916E
 	lsls r0, r2, 2
 	adds r0, r2
 	lsls r0, 3
 	adds r1, r0, r3
 	ldrb r0, [r1, 0x4]
 	cmp r0, 0x1
-	bne @080A9150
+	bne _080A9150
 	ldrb r0, [r1, 0x5]
 	cmp r0, 0xFE
-	bne @080A9150
-@080A916E:
+	bne _080A9150
+_080A916E:
 	adds r0, r2, 0
 	pop {r1}
 	bx r1
@@ -366,28 +366,28 @@ is_function_an_active_task: ; 80A91E4
 	adds r3, r0, 0
 	movs r2, 0
 	ldr r4, =0x03005e00
-@080A91EC:
+_080A91EC:
 	lsls r0, r2, 2
 	adds r0, r2
 	lsls r0, 3
 	adds r1, r0, r4
 	ldrb r0, [r1, 0x4]
 	cmp r0, 0x1
-	bne @080A9208
+	bne _080A9208
 	ldr r0, [r1]
 	cmp r0, r3
-	bne @080A9208
+	bne _080A9208
 	movs r0, 0x1
-	b @080A9214
+	b _080A9214
 	.pool
-@080A9208:
+_080A9208:
 	adds r0, r2, 0x1
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0xF
-	bls @080A91EC
+	bls _080A91EC
 	movs r0, 0
-@080A9214:
+_080A9214:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -400,24 +400,24 @@ get_task_id_by_function: ; 80A921C
 	adds r3, r0, 0
 	movs r2, 0
 	ldr r1, =0x03005e00
-@080A9224:
+_080A9224:
 	ldrb r0, [r1, 0x4]
 	cmp r0, 0x1
-	bne @080A923C
+	bne _080A923C
 	ldr r0, [r1]
 	cmp r0, r3
-	bne @080A923C
+	bne _080A923C
 	lsls r0, r2, 24
 	lsrs r0, 24
-	b @080A9246
+	b _080A9246
 	.pool
-@080A923C:
+_080A923C:
 	adds r1, 0x28
 	adds r2, 0x1
 	cmp r2, 0xF
-	ble @080A9224
+	ble _080A9224
 	movs r0, 0xFF
-@080A9246:
+_080A9246:
 	pop {r1}
 	bx r1
 	thumb_func_end get_task_id_by_function
@@ -428,23 +428,23 @@ sub_80A924C: ; 80A924C
 	movs r2, 0
 	movs r1, 0
 	ldr r3, =0x03005e00
-@080A9254:
+_080A9254:
 	lsls r0, r1, 2
 	adds r0, r1
 	lsls r0, 3
 	adds r0, r3
 	ldrb r0, [r0, 0x4]
 	cmp r0, 0x1
-	bne @080A9268
+	bne _080A9268
 	adds r0, r2, 0x1
 	lsls r0, 24
 	lsrs r2, r0, 24
-@080A9268:
+_080A9268:
 	adds r0, r1, 0x1
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0xF
-	bls @080A9254
+	bls _080A9254
 	adds r0, r2, 0
 	pop {r1}
 	bx r1
@@ -460,7 +460,7 @@ set_word_task_arg: ; 80A927C
 	lsls r1, 24
 	lsrs r3, r1, 24
 	cmp r3, 0xE
-	bhi @080A92AA
+	bhi _080A92AA
 	ldr r2, =0x03005e00
 	lsls r0, r3, 1
 	lsls r1, r4, 2
@@ -476,7 +476,7 @@ set_word_task_arg: ; 80A927C
 	adds r0, r2
 	lsrs r1, r5, 16
 	strh r1, [r0]
-@080A92AA:
+_080A92AA:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -491,10 +491,10 @@ get_word_task_arg: ; 80A92B4
 	lsls r1, 24
 	lsrs r1, 24
 	cmp r1, 0xE
-	bls @080A92C6
+	bls _080A92C6
 	movs r0, 0
-	b @080A92E8
-@080A92C6:
+	b _080A92E8
+_080A92C6:
 	ldr r3, =0x03005e00
 	lsls r0, r1, 1
 	lsls r2, r4, 2
@@ -512,7 +512,7 @@ get_word_task_arg: ; 80A92B4
 	ldrsh r1, [r1, r2]
 	lsls r1, 16
 	orrs r0, r1
-@080A92E8:
+_080A92E8:
 	pop {r4}
 	pop {r1}
 	bx r1