get rid of @ local labels

1 files changed, 207 insertions, 207 deletions

diff --git a/asm/multiboot.s b/asm/multiboot.s
index 0c09538ff..cecfa8ba7 100644
--- a/asm/multiboot.s
+++ b/asm/multiboot.s
@@ -37,25 +37,25 @@ MultiBootMain: ; 81BA70C
 	adds r7, r0, 0
 	bl MultiBootCheckComplete
 	cmp r0, 0
-	beq @081BA722
-	b @081BAAEA
-@081BA722:
+	beq _081BA722
+	b _081BAAEA
+_081BA722:
 	adds r0, r7, 0
 	adds r0, 0x4A
 	ldrb r1, [r0]
 	mov r10, r0
 	cmp r1, 0xF
-	bls @081BA736
+	bls _081BA736
 	subs r0, r1, 0x1
 	mov r1, r10
 	strb r0, [r1]
-	b @081BAAEA
-@081BA736:
+	b _081BAAEA
+_081BA736:
 	adds r1, r7, 0
 	adds r1, 0x48
 	ldrb r0, [r1]
 	cmp r0, 0
-	beq @081BA760
+	beq _081BA760
 	movs r0, 0
 	strb r0, [r1]
 	ldr r0, =0x04000128
@@ -63,79 +63,79 @@ MultiBootMain: ; 81BA70C
 	movs r5, 0xFC
 	ands r5, r0
 	cmp r5, 0x8
-	beq @081BA760
+	beq _081BA760
 	adds r0, r7, 0
 	bl MultiBootInit
 	movs r0, 0x8
 	eors r0, r5
-	b @081BAAEC
+	b _081BAAEC
 	.pool
-@081BA760:
+_081BA760:
 	ldrb r0, [r7, 0x18]
 	cmp r0, 0xDF
-	bls @081BA7B2
+	bls _081BA7B2
 	adds r0, r7, 0
 	bl MultiBootHandShake
 	adds r5, r0, 0
 	cmp r5, 0
-	beq @081BA774
-	b @081BAAEC
-@081BA774:
+	beq _081BA774
+	b _081BAAEC
+_081BA774:
 	adds r0, r7, 0
 	adds r0, 0x4B
 	ldrb r0, [r0]
 	cmp r0, 0x1
-	bne @081BA790
+	bne _081BA790
 	ldrb r0, [r7, 0x18]
 	cmp r0, 0xE1
-	bls @081BA790
+	bls _081BA790
 	adds r0, r7, 0
 	bl MultiBootCheckComplete
 	cmp r0, 0
-	bne @081BA790
-	b @081BAADA
-@081BA790:
+	bne _081BA790
+	b _081BAADA
+_081BA790:
 	adds r0, r7, 0
 	bl MultiBootCheckComplete
 	cmp r0, 0
-	beq @081BA79C
-	b @081BAAEA
-@081BA79C:
+	beq _081BA79C
+	b _081BAAEA
+_081BA79C:
 	ldrh r0, [r7, 0x16]
 	cmp r0, 0
-	bne @081BA7AC
+	bne _081BA7AC
 	adds r0, r7, 0
 	bl MultiBootInit
 	movs r0, 0x71
-	b @081BAAEC
-@081BA7AC:
+	b _081BAAEC
+_081BA7AC:
 	subs r0, 0x1
 	strh r0, [r7, 0x16]
-	b @081BAAEA
-@081BA7B2:
+	b _081BAAEA
+_081BA7B2:
 	ldrb r0, [r7, 0x18]
 	cmp r0, 0x2
-	bne @081BA7BA
-	b @081BA8F0
-@081BA7BA:
+	bne _081BA7BA
+	b _081BA8F0
+_081BA7BA:
 	cmp r0, 0x2
-	bgt @081BA7C8
+	bgt _081BA7C8
 	cmp r0, 0
-	beq @081BA7D6
+	beq _081BA7D6
 	cmp r0, 0x1
-	beq @081BA892
-	b @081BAA28
-@081BA7C8:
+	beq _081BA892
+	b _081BAA28
+_081BA7C8:
 	cmp r0, 0xD0
-	bne @081BA7CE
-	b @081BA93C
-@081BA7CE:
+	bne _081BA7CE
+	b _081BA93C
+_081BA7CE:
 	cmp r0, 0xD1
-	bne @081BA7D4
-	b @081BA9D6
-@081BA7D4:
-	b @081BAA28
-@081BA7D6:
+	bne _081BA7D4
+	b _081BA9D6
+_081BA7D4:
+	b _081BAA28
+_081BA7D6:
 	movs r3, 0xE
 	movs r5, 0x3
 	ldr r0, =0x04000120
@@ -145,19 +145,19 @@ MultiBootMain: ; 81BA70C
 	ldrb r2, [r7, 0x1E]
 	adds r6, r2, 0
 	cmp r1, r0
-	bne @081BA7FE
+	bne _081BA7FE
 	adds r4, r1, 0
 	ldr r1, =0x04000126
-@081BA7EE:
+_081BA7EE:
 	asrs r3, 1
 	subs r1, 0x2
 	subs r5, 0x1
 	cmp r5, 0
-	beq @081BA7FE
+	beq _081BA7FE
 	ldrh r0, [r1]
 	cmp r0, r4
-	beq @081BA7EE
-@081BA7FE:
+	beq _081BA7EE
+_081BA7FE:
 	movs r0, 0xE
 	ands r3, r0
 	strb r3, [r7, 0x1D]
@@ -169,14 +169,14 @@ MultiBootMain: ; 81BA70C
 	movs r1, 0x1
 	ands r0, r1
 	cmp r0, 0
-	beq @081BA82C
+	beq _081BA82C
 	ldr r0, =0x00007208
-	b @081BA852
+	b _081BA852
 	.pool
-@081BA82C:
+_081BA82C:
 	subs r5, 0x1
 	cmp r5, 0
-	beq @081BA858
+	beq _081BA858
 	lsls r0, r5, 1
 	ldr r1, =0x04000120
 	adds r0, r1
@@ -187,48 +187,48 @@ MultiBootMain: ; 81BA70C
 	movs r1, 0x1
 	ands r0, r1
 	cmp r0, 0
-	beq @081BA82C
+	beq _081BA82C
 	adds r0, r1, 0
 	lsls r0, r5
 	movs r1, 0xE4
 	lsls r1, 7
 	orrs r0, r1
-@081BA852:
+_081BA852:
 	cmp r4, r0
-	beq @081BA82C
+	beq _081BA82C
 	movs r3, 0
-@081BA858:
+_081BA858:
 	adds r0, r3, 0
 	ands r0, r6
 	strb r0, [r7, 0x1E]
 	cmp r3, 0
-	bne @081BA868
+	bne _081BA868
 	movs r0, 0xF
 	mov r2, r10
 	strb r0, [r2]
-@081BA868:
+_081BA868:
 	mov r1, r10
 	ldrb r0, [r1]
 	cmp r0, 0
-	bne @081BA884
+	bne _081BA884
 	ldrb r0, [r7, 0x1D]
 	ldrb r2, [r7, 0x1E]
 	cmp r0, r2
-	beq @081BA88A
+	beq _081BA88A
 	adds r0, r7, 0
 	bl MultiBootStartProbe
-	b @081BA892
+	b _081BA892
 	.pool
-@081BA884:
+_081BA884:
 	subs r0, 0x1
 	mov r1, r10
 	strb r0, [r1]
-@081BA88A:
+_081BA88A:
 	ldrb r1, [r7, 0x1E]
 	movs r2, 0xC4
 	lsls r2, 7
-	b @081BA992
-@081BA892:
+	b _081BA992
+_081BA892:
 	adds r1, r7, 0
 	adds r1, 0x49
 	movs r0, 0
@@ -236,7 +236,7 @@ MultiBootMain: ; 81BA70C
 	movs r5, 0x3
 	mov r12, r1
 	ldr r3, =0x0300129c
-@081BA8A0:
+_081BA8A0:
 	lsls r0, r5, 1
 	ldr r2, =0x04000120
 	adds r0, r2
@@ -245,7 +245,7 @@ MultiBootMain: ; 81BA70C
 	asrs r0, r4, 8
 	subs r2, r5, 0x1
 	cmp r0, 0x72
-	bne @081BA8CA
+	bne _081BA8CA
 	lsls r0, r2, 1
 	adds r0, r3
 	strh r4, [r0]
@@ -254,28 +254,28 @@ MultiBootMain: ; 81BA70C
 	movs r0, 0x1
 	lsls r0, r5
 	cmp r4, r0
-	bne @081BA8CA
+	bne _081BA8CA
 	ldrb r0, [r1]
 	orrs r4, r0
 	strb r4, [r1]
-@081BA8CA:
+_081BA8CA:
 	adds r5, r2, 0
 	cmp r5, 0
-	bne @081BA8A0
+	bne _081BA8A0
 	ldrb r0, [r7, 0x1D]
 	mov r1, r12
 	ldrb r1, [r1]
 	cmp r0, r1
-	bne @081BA88A
+	bne _081BA88A
 	movs r0, 0x2
 	strb r0, [r7, 0x18]
 	mov r2, r12
 	ldrb r1, [r2]
 	movs r2, 0xC2
 	lsls r2, 7
-	b @081BA992
+	b _081BA992
 	.pool
-@081BA8F0:
+_081BA8F0:
 	movs r5, 0x3
 	movs r0, 0x49
 	adds r0, r7
@@ -286,14 +286,14 @@ MultiBootMain: ; 81BA70C
 	mov r9, r1
 	ldr r2, =0x04000120
 	mov r8, r2
-@081BA904:
+_081BA904:
 	ldrb r3, [r4]
 	adds r0, r3, 0
 	asrs r0, r5
 	ands r0, r6
 	subs r2, r5, 0x1
 	cmp r0, 0
-	beq @081BA92A
+	beq _081BA92A
 	lsls r0, r5, 1
 	add r0, r8
 	ldrh r1, [r0]
@@ -301,18 +301,18 @@ MultiBootMain: ; 81BA70C
 	add r0, r9
 	ldrh r0, [r0]
 	cmp r1, r0
-	beq @081BA92A
+	beq _081BA92A
 	adds r0, r6, 0
 	lsls r0, r5
 	eors r3, r0
 	strb r3, [r4]
-@081BA92A:
+_081BA92A:
 	adds r5, r2, 0
 	cmp r5, 0
-	bne @081BA904
-	b @081BAA90
+	bne _081BA904
+	b _081BAA90
 	.pool
-@081BA93C:
+_081BA93C:
 	movs r3, 0x1
 	movs r5, 0x3
 	movs r0, 0x49
@@ -322,7 +322,7 @@ MultiBootMain: ; 81BA70C
 	adds r6, 0x19
 	ldr r1, =0x0300129c
 	mov r8, r1
-@081BA94E:
+_081BA94E:
 	lsls r0, r5, 1
 	ldr r2, =0x04000120
 	adds r0, r2
@@ -337,48 +337,48 @@ MultiBootMain: ; 81BA70C
 	movs r0, 0x1
 	ands r1, r0
 	cmp r1, 0
-	beq @081BA982
+	beq _081BA982
 	asrs r0, r4, 8
 	subs r0, 0x72
 	cmp r0, 0x1
-	bls @081BA976
-	b @081BAAE0
-@081BA976:
+	bls _081BA976
+	b _081BAAE0
+_081BA976:
 	lsls r0, r2, 1
 	add r0, r8
 	ldrh r0, [r0]
 	cmp r4, r0
-	bne @081BA982
+	bne _081BA982
 	movs r3, 0
-@081BA982:
+_081BA982:
 	adds r5, r2, 0
 	cmp r5, 0
-	bne @081BA94E
+	bne _081BA94E
 	cmp r3, 0
-	bne @081BA9A8
+	bne _081BA9A8
 	ldrb r1, [r7, 0x1C]
 	movs r2, 0xC6
 	lsls r2, 7
-@081BA992:
+_081BA992:
 	adds r0, r2, 0
 	orrs r1, r0
 	adds r0, r7, 0
 	bl MultiBootSend
-	b @081BAAEC
+	b _081BAAEC
 	.pool
-@081BA9A8:
+_081BA9A8:
 	movs r0, 0xD1
 	strb r0, [r7, 0x18]
 	movs r3, 0x11
 	movs r5, 0x3
 	adds r1, r6, 0x2
-@081BA9B2:
+_081BA9B2:
 	ldrb r0, [r1]
 	adds r3, r0
 	subs r1, 0x1
 	subs r5, 0x1
 	cmp r5, 0
-	bne @081BA9B2
+	bne _081BA9B2
 	strb r3, [r7, 0x14]
 	movs r0, 0xFF
 	ands r3, r0
@@ -389,49 +389,49 @@ MultiBootMain: ; 81BA70C
 	adds r0, r7, 0
 	adds r1, r3, 0
 	bl MultiBootSend
-	b @081BAAEC
-@081BA9D6:
+	b _081BAAEC
+_081BA9D6:
 	movs r5, 0x3
 	movs r2, 0x49
 	ldrb r1, [r2, r7]
 	ldr r2, =0x04000126
 	movs r3, 0x1
-@081BA9E0:
+_081BA9E0:
 	ldrh r0, [r2]
 	adds r4, r0, 0
 	adds r0, r1, 0
 	asrs r0, r5
 	ands r0, r3
 	cmp r0, 0
-	beq @081BA9F4
+	beq _081BA9F4
 	asrs r0, r4, 8
 	cmp r0, 0x73
-	bne @081BAAE0
-@081BA9F4:
+	bne _081BAAE0
+_081BA9F4:
 	subs r2, 0x2
 	subs r5, 0x1
 	cmp r5, 0
-	bne @081BA9E0
+	bne _081BA9E0
 	adds r0, r7, 0
 	bl MultiBoot
 	adds r5, r0, 0
 	cmp r5, 0
-	bne @081BAA18
+	bne _081BAA18
 	movs r0, 0xE0
 	strb r0, [r7, 0x18]
 	adds r0, 0xB0
 	strh r0, [r7, 0x16]
-	b @081BAAEA
+	b _081BAAEA
 	.pool
-@081BAA18:
+_081BAA18:
 	adds r0, r7, 0
 	bl MultiBootInit
 	movs r0, 0x1E
 	mov r1, r10
 	strb r0, [r1]
 	movs r0, 0x70
-	b @081BAAEC
-@081BAA28:
+	b _081BAAEC
+_081BAA28:
 	movs r5, 0x3
 	movs r2, 0x49
 	adds r2, r7
@@ -439,7 +439,7 @@ MultiBootMain: ; 81BA70C
 	mov r8, r12
 	movs r0, 0x1
 	mov r9, r0
-@081BAA36:
+_081BAA36:
 	mov r1, r8
 	ldrb r6, [r1]
 	adds r0, r6, 0
@@ -447,7 +447,7 @@ MultiBootMain: ; 81BA70C
 	mov r2, r9
 	ands r0, r2
 	cmp r0, 0
-	beq @081BAA70
+	beq _081BAA70
 	lsls r0, r5, 1
 	ldr r1, =0x04000120
 	adds r0, r1
@@ -461,49 +461,49 @@ MultiBootMain: ; 81BA70C
 	mov r3, r9
 	lsls r3, r5
 	cmp r2, r1
-	bne @081BAA6A
+	bne _081BAA6A
 	movs r0, 0xFF
 	ands r4, r0
 	cmp r4, r3
-	beq @081BAA70
-@081BAA6A:
+	beq _081BAA70
+_081BAA6A:
 	eors r6, r3
 	mov r2, r8
 	strb r6, [r2]
-@081BAA70:
+_081BAA70:
 	subs r5, 0x1
 	cmp r5, 0
-	bne @081BAA36
+	bne _081BAA36
 	ldrb r0, [r7, 0x18]
 	cmp r0, 0xC4
-	bne @081BAA90
+	bne _081BAA90
 	mov r0, r12
 	ldrb r1, [r0]
 	movs r0, 0xE
 	ands r0, r1
 	strb r0, [r7, 0x1E]
 	strb r5, [r7, 0x18]
-	b @081BA88A
+	b _081BA88A
 	.pool
-@081BAA90:
+_081BAA90:
 	mov r1, r12
 	ldrb r0, [r1]
 	cmp r0, 0
-	bne @081BAAA2
+	bne _081BAAA2
 	adds r0, r7, 0
 	bl MultiBootInit
 	movs r0, 0x50
-	b @081BAAEC
-@081BAAA2:
+	b _081BAAEC
+_081BAAA2:
 	ldrb r0, [r7, 0x18]
 	adds r0, 0x2
 	strb r0, [r7, 0x18]
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xC4
-	bne @081BAAB2
-	b @081BA88A
-@081BAAB2:
+	bne _081BAAB2
+	b _081BA88A
+_081BAAB2:
 	ldrb r0, [r7, 0x18]
 	ldr r1, [r7, 0x28]
 	adds r0, r1
@@ -517,23 +517,23 @@ MultiBootMain: ; 81BA70C
 	bl MultiBootSend
 	adds r5, r0, 0
 	cmp r5, 0
-	bne @081BAAEC
+	bne _081BAAEC
 	adds r0, r7, 0
 	adds r0, 0x4B
 	ldrb r0, [r0]
 	cmp r0, 0x1
-	bne @081BAAEA
-@081BAADA:
+	bne _081BAAEA
+_081BAADA:
 	bl MultiBootWaitSendDone
-	b @081BA736
-@081BAAE0:
+	b _081BA736
+_081BAAE0:
 	adds r0, r7, 0
 	bl MultiBootInit
 	movs r0, 0x60
-	b @081BAAEC
-@081BAAEA:
+	b _081BAAEC
+_081BAAEA:
 	movs r0, 0
-@081BAAEC:
+_081BAAEC:
 	pop {r3-r5}
 	mov r8, r3
 	mov r9, r4
@@ -555,7 +555,7 @@ MultiBootSend: ; 81BAAFC
 	movs r4, 0x8C
 	ands r4, r0
 	cmp r4, 0x8
-	bne @081BAB34
+	bne _081BAB34
 	ldr r0, =0x0400012a
 	strh r1, [r0]
 	ldr r1, =0x00002083
@@ -566,15 +566,15 @@ MultiBootSend: ; 81BAAFC
 	movs r0, 0x1
 	strb r0, [r1]
 	movs r0, 0
-	b @081BAB40
+	b _081BAB40
 	.pool
-@081BAB34:
+_081BAB34:
 	adds r0, r2, 0
 	bl MultiBootInit
 	movs r0, 0x8
 	eors r4, r0
 	adds r0, r4, 0
-@081BAB40:
+_081BAB40:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -587,18 +587,18 @@ MultiBootStartProbe: ; 81BAB48
 	adds r1, r0, 0
 	ldrb r0, [r1, 0x18]
 	cmp r0, 0
-	beq @081BAB5A
+	beq _081BAB5A
 	adds r0, r1, 0
 	bl MultiBootInit
-	b @081BAB66
-@081BAB5A:
+	b _081BAB66
+_081BAB5A:
 	adds r2, r1, 0
 	adds r2, 0x4A
 	strb r0, [r2]
 	strb r0, [r1, 0x1E]
 	movs r0, 0x1
 	strb r0, [r1, 0x18]
-@081BAB66:
+_081BAB66:
 	pop {r0}
 	bx r0
 	thumb_func_end MultiBootStartProbe
@@ -617,15 +617,15 @@ MultiBootStartMaster: ; 81BAB6C
 	movs r3, 0
 	ldrb r0, [r4, 0x18]
 	cmp r0, 0
-	bne @081BABA8
+	bne _081BABA8
 	ldrb r0, [r4, 0x1E]
 	cmp r0, 0
-	beq @081BABA8
+	beq _081BABA8
 	adds r0, r4, 0
 	adds r0, 0x4A
 	ldrb r0, [r0]
 	cmp r0, 0
-	bne @081BABA8
+	bne _081BABA8
 	str r6, [r4, 0x20]
 	adds r2, 0xF
 	movs r0, 0x10
@@ -635,13 +635,13 @@ MultiBootStartMaster: ; 81BAB6C
 	adds r1, r2, r0
 	ldr r0, =0x0003ff00
 	cmp r1, r0
-	bls @081BABB4
-@081BABA8:
+	bls _081BABB4
+_081BABA8:
 	adds r0, r4, 0
 	bl MultiBootInit
-	b @081BAC28
+	b _081BAC28
 	.pool
-@081BABB4:
+_081BABB4:
 	adds r0, r6, r2
 	str r0, [r4, 0x24]
 	lsls r1, r7, 24
@@ -651,41 +651,41 @@ MultiBootStartMaster: ; 81BAB6C
 	asrs r0, 24
 	adds r2, r1, 0
 	cmp r0, 0x8
-	bhi @081BAC14
+	bhi _081BAC14
 	lsls r0, 2
-	ldr r1, =@081BABD8
+	ldr r1, =_081BABD8
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.pool
 	.align 2, 0
-@081BABD8:
-	.4byte @081BABFC
-	.4byte @081BABFC
-	.4byte @081BABFC
-	.4byte @081BABFC
-	.4byte @081BAC06
-	.4byte @081BAC0C
-	.4byte @081BAC0C
-	.4byte @081BAC0C
-	.4byte @081BAC0C
-@081BABFC:
+_081BABD8:
+	.4byte _081BABFC
+	.4byte _081BABFC
+	.4byte _081BABFC
+	.4byte _081BABFC
+	.4byte _081BAC06
+	.4byte _081BAC0C
+	.4byte _081BAC0C
+	.4byte _081BAC0C
+	.4byte _081BAC0C
+_081BABFC:
 	lsls r3, r5, 3
 	asrs r1, r2, 24
 	movs r0, 0x3
 	subs r0, r1
-	b @081BAC12
-@081BAC06:
+	b _081BAC12
+_081BAC06:
 	movs r0, 0x38
 	adds r3, r5, 0
-	b @081BAC12
-@081BAC0C:
+	b _081BAC12
+_081BAC0C:
 	lsls r3, r5, 3
 	asrs r0, r2, 24
 	subs r0, 0x1
-@081BAC12:
+_081BAC12:
 	orrs r3, r0
-@081BAC14:
+_081BAC14:
 	movs r0, 0x3F
 	ands r3, r0
 	lsls r0, r3, 1
@@ -696,7 +696,7 @@ MultiBootStartMaster: ; 81BAB6C
 	strb r0, [r4, 0x1C]
 	movs r0, 0xD0
 	strb r0, [r4, 0x18]
-@081BAC28:
+_081BAC28:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -708,12 +708,12 @@ MultiBootCheckComplete: ; 81BAC30
 	push {lr}
 	ldrb r0, [r0, 0x18]
 	cmp r0, 0xE9
-	beq @081BAC3C
+	beq _081BAC3C
 	movs r0, 0
-	b @081BAC3E
-@081BAC3C:
+	b _081BAC3E
+_081BAC3C:
 	movs r0, 0x1
-@081BAC3E:
+_081BAC3E:
 	pop {r1}
 	bx r1
 	thumb_func_end MultiBootCheckComplete
@@ -725,17 +725,17 @@ MultiBootHandShake: ; 81BAC44
 	adds r3, r0, 0
 	ldrb r0, [r3, 0x18]
 	cmp r0, 0xE0
-	beq @081BAC60
+	beq _081BAC60
 	cmp r0, 0xE0
-	blt @081BAC70
+	blt _081BAC70
 	cmp r0, 0xE8
-	bgt @081BAC70
+	bgt _081BAC70
 	cmp r0, 0xE7
-	blt @081BAC70
+	blt _081BAC70
 	movs r4, 0x3
 	ldrb r5, [r3, 0x1E]
-	b @081BACD0
-@081BAC60:
+	b _081BACD0
+_081BAC60:
 	movs r1, 0
 	movs r0, 0xE1
 	strb r0, [r3, 0x18]
@@ -743,28 +743,28 @@ MultiBootHandShake: ; 81BAC44
 	movs r0, 0x80
 	lsls r0, 13
 	str r0, [r3]
-	b @081BACC2
-@081BAC70:
+	b _081BACC2
+_081BAC70:
 	movs r4, 0x3
 	ldrb r5, [r3, 0x1E]
 	movs r6, 0x1
 	ldr r1, =0x04000126
-@081BAC78:
+_081BAC78:
 	ldrh r0, [r1]
 	adds r2, r0, 0
 	adds r0, r5, 0
 	asrs r0, r4
 	ands r0, r6
 	cmp r0, 0
-	beq @081BAC8C
+	beq _081BAC8C
 	ldr r0, [r3, 0x4]
 	cmp r2, r0
-	bne @081BAC60
-@081BAC8C:
+	bne _081BAC60
+_081BAC8C:
 	subs r1, 0x2
 	subs r4, 0x1
 	cmp r4, 0
-	bne @081BAC78
+	bne _081BAC78
 	ldrb r0, [r3, 0x18]
 	adds r0, 0x1
 	strb r0, [r3, 0x18]
@@ -772,7 +772,7 @@ MultiBootHandShake: ; 81BAC44
 	ldrh r0, [r3]
 	str r0, [r3, 0x4]
 	cmp r1, 0
-	bne @081BACBA
+	bne _081BACBA
 	ldr r0, [r3, 0x28]
 	adds r1, r0, 0
 	adds r1, 0xAC
@@ -784,18 +784,18 @@ MultiBootHandShake: ; 81BAC44
 	str r1, [r3, 0x4]
 	lsls r1, 5
 	str r1, [r3]
-@081BACBA:
+_081BACBA:
 	ldr r0, [r3]
 	lsrs r0, 5
 	str r0, [r3]
-@081BACC0:
+_081BACC0:
 	ldrh r1, [r3]
-@081BACC2:
+_081BACC2:
 	adds r0, r3, 0
 	bl MultiBootSend
-	b @081BAD28
+	b _081BAD28
 	.pool
-@081BACD0:
+_081BACD0:
 	lsls r0, r4, 1
 	ldr r1, =0x04000120
 	adds r0, r1
@@ -806,21 +806,21 @@ MultiBootHandShake: ; 81BAC44
 	movs r1, 0x1
 	ands r0, r1
 	cmp r0, 0
-	beq @081BACEC
+	beq _081BACEC
 	ldr r0, [r3, 0x4]
 	cmp r2, r0
-	bne @081BAD1C
-@081BACEC:
+	bne _081BAD1C
+_081BACEC:
 	subs r4, 0x1
 	cmp r4, 0
-	bne @081BACD0
+	bne _081BACD0
 	ldrb r0, [r3, 0x18]
 	adds r0, 0x1
 	strb r0, [r3, 0x18]
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xE9
-	beq @081BAD26
+	beq _081BAD26
 	ldr r0, [r3, 0x28]
 	adds r1, r0, 0
 	adds r1, 0xAE
@@ -831,16 +831,16 @@ MultiBootHandShake: ; 81BAC44
 	orrs r1, r0
 	str r1, [r3]
 	str r1, [r3, 0x4]
-	b @081BACC0
+	b _081BACC0
 	.pool
-@081BAD1C:
+_081BAD1C:
 	adds r0, r3, 0
 	bl MultiBootInit
 	movs r0, 0x71
-	b @081BAD28
-@081BAD26:
+	b _081BAD28
+_081BAD26:
 	movs r0, 0
-@081BAD28:
+_081BAD28:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -853,14 +853,14 @@ MultiBootWaitCycles: ; 81BAD30
 	lsrs r2, 24
 	movs r1, 0xC
 	cmp r2, 0x2
-	beq @081BAD42
+	beq _081BAD42
 	movs r1, 0xD
 	cmp r2, 0x8
-	beq @081BAD42
+	beq _081BAD42
 	movs r1, 0x4
-@081BAD42:
+_081BAD42:
 	subs r0, r1
-	bgt @081BAD42
+	bgt _081BAD42
 	bx lr
 	thumb_func_end MultiBootWaitCycles
 
@@ -874,19 +874,19 @@ MultiBootWaitSendDone: ; 81BAD48
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	beq @081BAD6C
+	beq _081BAD6C
 	ldr r5, =0x0000795c
 	movs r4, 0x80
-@081BAD5C:
+_081BAD5C:
 	adds r2, 0x1
 	cmp r2, r5
-	bgt @081BAD6C
+	bgt _081BAD6C
 	ldrh r1, [r3]
 	adds r0, r4, 0
 	ands r0, r1
 	cmp r0, 0
-	bne @081BAD5C
-@081BAD6C:
+	bne _081BAD5C
+_081BAD6C:
 	movs r0, 0x96
 	lsls r0, 2
 	bl MultiBootWaitCycles