update for modified assembler

1 files changed, 77 insertions, 77 deletions

diff --git a/asm/gpu_reg_manager.s b/asm/gpu_reg_manager.s
index 7cd842e53..f6362ae7f 100644
--- a/asm/gpu_reg_manager.s
+++ b/asm/gpu_reg_manager.s
@@ -1,6 +1,6 @@
 	thumb_func_start lcd_io_copy_queue_clean
-@ void lcd_io_copy_queue_clean()
-lcd_io_copy_queue_clean: @ 8000FE4
+; void lcd_io_copy_queue_clean()
+lcd_io_copy_queue_clean: ; 8000FE4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -14,7 +14,7 @@ lcd_io_copy_queue_clean: @ 8000FE4
 	movs r5, 0
 	ldr r4, =0x03000878
 	movs r3, 0xFF
-_08000FFE:
+@08000FFE:
 	adds r0, r2, r6
 	strb r5, [r0]
 	adds r1, r2, r4
@@ -23,7 +23,7 @@ _08000FFE:
 	strb r0, [r1]
 	adds r2, 0x1
 	cmp r2, 0x5F
-	ble _08000FFE
+	ble @08000FFE
 	movs r0, 0
 	strb r0, [r7]
 	mov r1, r12
@@ -41,13 +41,13 @@ _08000FFE:
 	thumb_func_end lcd_io_copy_queue_clean
 
 	thumb_func_start lcd_io_buffer_to_hardware
-@ void lcd_io_buffer_to_hardware(u8 reg)
-lcd_io_buffer_to_hardware: @ 800103C
+; void lcd_io_buffer_to_hardware(u8 reg)
+lcd_io_buffer_to_hardware: ; 800103C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0x4
-	bne _08001068
+	bne @08001068
 	ldr r2, =0x04000004
 	ldrh r1, [r2]
 	ldr r0, =0x0000ffe7
@@ -58,10 +58,10 @@ lcd_io_buffer_to_hardware: @ 800103C
 	ldrh r1, [r1]
 	orrs r0, r1
 	strh r0, [r2]
-	b _08001076
+	b @08001076
 	.align 2, 0
 	.pool
-_08001068:
+@08001068:
 	movs r0, 0x80
 	lsls r0, 19
 	adds r0, r2, r0
@@ -69,7 +69,7 @@ _08001068:
 	adds r1, r2, r1
 	ldrh r1, [r1]
 	strh r1, [r0]
-_08001076:
+@08001076:
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -77,27 +77,27 @@ _08001076:
 	thumb_func_end lcd_io_buffer_to_hardware
 
 	thumb_func_start lcd_io_copy_queue_process
-@ void lcd_io_copy_queue_process()
-lcd_io_copy_queue_process: @ 8001080
+; void lcd_io_copy_queue_process()
+lcd_io_copy_queue_process: ; 8001080
 	push {r4,r5,lr}
 	ldr r0, =0x030008d8
 	ldrb r0, [r0]
 	cmp r0, 0
-	bne _080010A4
+	bne @080010A4
 	movs r5, 0
-_0800108C:
+@0800108C:
 	ldr r0, =0x03000878
 	adds r4, r5, r0
 	ldrb r0, [r4]
 	cmp r0, 0xFF
-	beq _080010A4
+	beq @080010A4
 	bl lcd_io_buffer_to_hardware
 	movs r0, 0xFF
 	strb r0, [r4]
 	adds r5, 0x1
 	cmp r5, 0x5F
-	ble _0800108C
-_080010A4:
+	ble @0800108C
+@080010A4:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -106,15 +106,15 @@ _080010A4:
 	thumb_func_end lcd_io_copy_queue_process
 
 	thumb_func_start lcd_io_set
-@ void lcd_io_set(u8 reg, u16 value)
-lcd_io_set: @ 80010B4
+; void lcd_io_set(u8 reg, u16 value)
+lcd_io_set: ; 80010B4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
 	lsls r1, 16
 	lsrs r1, 16
 	cmp r4, 0x5F
-	bhi _08001130
+	bhi @08001130
 	ldr r0, =0x03000818
 	adds r0, r4, r0
 	strh r1, [r0]
@@ -126,25 +126,25 @@ lcd_io_set: @ 80010B4
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x40
-	bls _080010E8
+	bls @080010E8
 	movs r0, 0x80
 	lsls r0, 19
 	ldrh r1, [r0]
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	beq _080010FE
-_080010E8:
+	beq @080010FE
+@080010E8:
 	adds r0, r4, 0
 	bl lcd_io_buffer_to_hardware
-	b _08001130
+	b @08001130
 	.align 2, 0
 	.pool
-_080010F8:
+@080010F8:
 	movs r0, 0
 	strb r0, [r5]
-	b _08001130
-_080010FE:
+	b @08001130
+@080010FE:
 	ldr r2, =0x030008d8
 	movs r0, 0x1
 	strb r0, [r2]
@@ -154,25 +154,25 @@ _080010FE:
 	adds r5, r2, 0
 	adds r2, r0, 0
 	cmp r1, 0xFF
-	beq _08001128
+	beq @08001128
 	adds r1, r2, 0
-_08001114:
+@08001114:
 	ldrb r0, [r1]
 	cmp r0, r4
-	beq _080010F8
+	beq @080010F8
 	adds r1, 0x1
 	adds r3, 0x1
 	cmp r3, 0x5F
-	bgt _08001128
+	bgt @08001128
 	ldrb r0, [r1]
 	cmp r0, 0xFF
-	bne _08001114
-_08001128:
+	bne @08001114
+@08001128:
 	adds r0, r3, r2
 	movs r1, 0
 	strb r4, [r0]
 	strb r1, [r5]
-_08001130:
+@08001130:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -181,15 +181,15 @@ _08001130:
 	thumb_func_end lcd_io_set
 
 	thumb_func_start lcd_io_set_forced_blank
-@ void lcd_io_set_forced_blank(u8 reg, u16 value)
-lcd_io_set_forced_blank: @ 8001140
+; void lcd_io_set_forced_blank(u8 reg, u16 value)
+lcd_io_set_forced_blank: ; 8001140
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
 	lsls r1, 16
 	lsrs r1, 16
 	cmp r4, 0x5F
-	bhi _080011A8
+	bhi @080011A8
 	ldr r0, =0x03000818
 	adds r0, r4, r0
 	strh r1, [r0]
@@ -199,17 +199,17 @@ lcd_io_set_forced_blank: @ 8001140
 	movs r0, 0x80
 	ands r0, r1
 	cmp r0, 0
-	beq _08001176
+	beq @08001176
 	adds r0, r4, 0
 	bl lcd_io_buffer_to_hardware
-	b _080011A8
+	b @080011A8
 	.align 2, 0
 	.pool
-_08001170:
+@08001170:
 	movs r0, 0
 	strb r0, [r5]
-	b _080011A8
-_08001176:
+	b @080011A8
+@08001176:
 	ldr r2, =0x030008d8
 	movs r0, 0x1
 	strb r0, [r2]
@@ -219,25 +219,25 @@ _08001176:
 	adds r5, r2, 0
 	adds r2, r0, 0
 	cmp r1, 0xFF
-	beq _080011A0
+	beq @080011A0
 	adds r1, r2, 0
-_0800118C:
+@0800118C:
 	ldrb r0, [r1]
 	cmp r0, r4
-	beq _08001170
+	beq @08001170
 	adds r1, 0x1
 	adds r3, 0x1
 	cmp r3, 0x5F
-	bgt _080011A0
+	bgt @080011A0
 	ldrb r0, [r1]
 	cmp r0, 0xFF
-	bne _0800118C
-_080011A0:
+	bne @0800118C
+@080011A0:
 	adds r0, r3, r2
 	movs r1, 0
 	strb r4, [r0]
 	strb r1, [r5]
-_080011A8:
+@080011A8:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -246,32 +246,32 @@ _080011A8:
 	thumb_func_end lcd_io_set_forced_blank
 
 	thumb_func_start lcd_io_get
-@ u16 lcd_io_get(u8 reg)
-lcd_io_get: @ 80011B8
+; u16 lcd_io_get(u8 reg)
+lcd_io_get: ; 80011B8
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	adds r1, r0, 0
 	cmp r1, 0x4
-	bne _080011CC
+	bne @080011CC
 	ldr r0, =0x04000004
-	b _080011DE
+	b @080011DE
 	.align 2, 0
 	.pool
-_080011CC:
+@080011CC:
 	cmp r1, 0x6
-	beq _080011DC
+	beq @080011DC
 	ldr r0, =0x03000818
 	adds r0, r1, r0
 	ldrh r0, [r0]
-	b _080011E0
+	b @080011E0
 	.align 2, 0
 	.pool
-_080011DC:
+@080011DC:
 	ldr r0, =0x04000006
-_080011DE:
+@080011DE:
 	ldrh r0, [r0]
-_080011E0:
+@080011E0:
 	pop {r1}
 	bx r1
 	.align 2, 0
@@ -279,8 +279,8 @@ _080011E0:
 	thumb_func_end lcd_io_get
 
 	thumb_func_start lcd_io_set_bits
-@ void lcd_io_set_bits(u8 reg, u16 mask)
-lcd_io_set_bits: @ 80011E8
+; void lcd_io_set_bits(u8 reg, u16 mask)
+lcd_io_set_bits: ; 80011E8
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -299,8 +299,8 @@ lcd_io_set_bits: @ 80011E8
 	thumb_func_end lcd_io_set_bits
 
 	thumb_func_start lcd_io_clear_bits
-@ void lcd_io_clear_bits(u8 reg, u16 mask)
-lcd_io_clear_bits: @ 8001208
+; void lcd_io_clear_bits(u8 reg, u16 mask)
+lcd_io_clear_bits: ; 8001208
 	push {lr}
 	adds r2, r1, 0
 	lsls r0, 24
@@ -319,13 +319,13 @@ lcd_io_clear_bits: @ 8001208
 	thumb_func_end lcd_io_clear_bits
 
 	thumb_func_start update_hardware_IE
-@ void update_hardware_IE()
-update_hardware_IE: @ 8001228
+; void update_hardware_IE()
+update_hardware_IE: ; 8001228
 	push {r4,r5,lr}
 	ldr r5, =0x030008d9
 	ldrb r0, [r5]
 	cmp r0, 0
-	beq _08001246
+	beq @08001246
 	ldr r2, =0x04000208
 	ldrh r1, [r2]
 	movs r4, 0
@@ -336,7 +336,7 @@ update_hardware_IE: @ 8001228
 	strh r0, [r3]
 	strh r1, [r2]
 	strb r4, [r5]
-_08001246:
+@08001246:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -345,8 +345,8 @@ _08001246:
 	thumb_func_end update_hardware_IE
 
 	thumb_func_start enable_irqs
-@ void enable_irqs(u16 value)
-enable_irqs: @ 800125C
+; void enable_irqs(u16 value)
+enable_irqs: ; 800125C
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -368,8 +368,8 @@ enable_irqs: @ 800125C
 	thumb_func_end enable_irqs
 
 	thumb_func_start disable_irqs
-@ void disable_irqs(u16 value)
-disable_irqs: @ 8001288
+; void disable_irqs(u16 value)
+disable_irqs: ; 8001288
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r0, 16
@@ -391,8 +391,8 @@ disable_irqs: @ 8001288
 	thumb_func_end disable_irqs
 
 	thumb_func_start dispstat_set_vblank_hblank_irqs
-@ void dispstat_set_vblank_hblank_irqs(u16 value)
-dispstat_set_vblank_hblank_irqs: @ 80012B4
+; void dispstat_set_vblank_hblank_irqs(u16 value)
+dispstat_set_vblank_hblank_irqs: ; 80012B4
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 16
@@ -411,15 +411,15 @@ dispstat_set_vblank_hblank_irqs: @ 80012B4
 	movs r0, 0x2
 	ands r0, r4
 	cmp r0, 0
-	beq _080012E0
+	beq @080012E0
 	movs r0, 0x10
 	orrs r1, r0
-_080012E0:
+@080012E0:
 	cmp r2, r1
-	beq _080012EA
+	beq @080012EA
 	movs r0, 0x4
 	bl lcd_io_set
-_080012EA:
+@080012EA:
 	pop {r4}
 	pop {r0}
 	bx r0