update for modified assembler

1 files changed, 109 insertions, 109 deletions

diff --git a/asm/main.s b/asm/main.s
index 1e6e8b426..cab084eb7 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -37,10 +37,10 @@ Main:
 	ldr r0, =0x03005d88
 	ldr r0, [r0]
 	cmp r0, 0x1
-	beq _08000414
+	beq @08000414
 	movs r0, 0
 	bl set_callback2
-_08000414:
+@08000414:
 	ldr r2, =0x030022b4
 	strb r4, [r2]
 	ldr r1, =0x03000000
@@ -52,36 +52,36 @@ _08000414:
 	movs r0, 0
 	mov r8, r0
 	adds r6, r2, 0
-_0800042A:
+@0800042A:
 	bl load_keys
 	ldr r0, =0x03002700
 	ldrb r0, [r0]
 	cmp r0, 0
-	bne _08000454
+	bne @08000454
 	ldrh r1, [r7, 0x28]
 	movs r0, 0x1
 	ands r0, r1
 	cmp r0, 0
-	beq _08000454
+	beq @08000454
 	movs r0, 0xE
 	ands r0, r1
 	cmp r0, 0xE
-	bne _08000454
+	bne @08000454
 	bl rfu_REQ_stopMode
 	bl rfu_waitREQComplete
 	bl do_reset
-_08000454:
+@08000454:
 	bl sub_8087634
 	cmp r0, 0x1
-	bne _0800048C
+	bne @0800048C
 	strb r0, [r6]
 	bl call_callbacks_wrapper
 	movs r0, 0
 	strb r0, [r6]
-	b _080004B2
+	b @080004B2
 	.align 2, 0
 	.pool
-_0800048C:
+@0800048C:
 	ldr r5, =0x030022b4
 	movs r0, 0
 	strb r0, [r5]
@@ -89,7 +89,7 @@ _0800048C:
 	bl sub_80875C8
 	adds r4, r0, 0
 	cmp r4, 0x1
-	bne _080004B2
+	bne @080004B2
 	movs r0, 0
 	strh r0, [r7, 0x2E]
 	bl copy_queue_clear
@@ -97,32 +97,32 @@ _0800048C:
 	bl call_callbacks_wrapper
 	mov r2, r8
 	strb r2, [r5]
-_080004B2:
+@080004B2:
 	bl gametime_increment
 	bl sound_something
 	bl wait_for_vblank
-	b _0800042A
+	b @0800042A
 	.align 2, 0
 	.pool
 	thumb_func_end Main
 
 	thumb_func_start call_callbacks_wrapper
-@ void call_callbacks_wrapper()
-call_callbacks_wrapper: @ 80004C4
+; void call_callbacks_wrapper()
+call_callbacks_wrapper: ; 80004C4
 	push {lr}
 	bl sub_800B40C
 	lsls r0, 24
 	cmp r0, 0
-	bne _080004D4
+	bne @080004D4
 	bl call_callbacks
-_080004D4:
+@080004D4:
 	pop {r0}
 	bx r0
 	thumb_func_end call_callbacks_wrapper
 
 	thumb_func_start init_saveblock_ptrs_and_set_copyright_callback2
-@ void init_saveblock_ptrs_and_set_copyright_callback2()
-init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8
+; void init_saveblock_ptrs_and_set_copyright_callback2()
+init_saveblock_ptrs_and_set_copyright_callback2: ; 80004D8
 	push {lr}
 	ldr r2, =0x030022c0
 	movs r0, 0
@@ -146,20 +146,20 @@ init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8
 	thumb_func_end init_saveblock_ptrs_and_set_copyright_callback2
 
 	thumb_func_start call_callbacks
-@ void call_callbacks()
-call_callbacks: @ 800051C
+; void call_callbacks()
+call_callbacks: ; 800051C
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4]
 	cmp r0, 0
-	beq _0800052A
+	beq @0800052A
 	bl _call_via_r0
-_0800052A:
+@0800052A:
 	ldr r0, [r4, 0x4]
 	cmp r0, 0
-	beq _08000534
+	beq @08000534
 	bl _call_via_r0
-_08000534:
+@08000534:
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -168,8 +168,8 @@ _08000534:
 	thumb_func_end call_callbacks
 
 	thumb_func_start set_callback2
-@ void set_callback2(void ( *func)())
-set_callback2: @ 8000540
+; void set_callback2(void ( *func)())
+set_callback2: ; 8000540
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x4]
 	movs r0, 0x87
@@ -183,8 +183,8 @@ set_callback2: @ 8000540
 	thumb_func_end set_callback2
 
 	thumb_func_start start_timer1
-@ void start_timer1()
-start_timer1: @ 8000554
+; void start_timer1()
+start_timer1: ; 8000554
 	ldr r1, =0x04000106
 	movs r0, 0x80
 	strh r0, [r1]
@@ -194,8 +194,8 @@ start_timer1: @ 8000554
 	thumb_func_end start_timer1
 
 	thumb_func_start set_rand_seed_and_trainer_id_hi
-@ void set_rand_seed_and_trainer_id_hi()
-set_rand_seed_and_trainer_id_hi: @ 8000560
+; void set_rand_seed_and_trainer_id_hi()
+set_rand_seed_and_trainer_id_hi: ; 8000560
 	push {r4,lr}
 	ldr r0, =0x04000104
 	ldrh r4, [r0]
@@ -214,8 +214,8 @@ set_rand_seed_and_trainer_id_hi: @ 8000560
 	thumb_func_end set_rand_seed_and_trainer_id_hi
 
 	thumb_func_start get_trainer_id_hi
-@ u16 get_trainer_id_hi()
-get_trainer_id_hi: @ 8000588
+; u16 get_trainer_id_hi()
+get_trainer_id_hi: ; 8000588
 	ldr r0, =0x02020000
 	ldrh r0, [r0]
 	bx lr
@@ -224,8 +224,8 @@ get_trainer_id_hi: @ 8000588
 	thumb_func_end get_trainer_id_hi
 
 	thumb_func_start lcd_enable_vcount_irq_at_150px
-@ void lcd_enable_vcount_irq_at_150px()
-lcd_enable_vcount_irq_at_150px: @ 8000594
+; void lcd_enable_vcount_irq_at_150px()
+lcd_enable_vcount_irq_at_150px: ; 8000594
 	push {lr}
 	movs r0, 0x4
 	bl lcd_io_get
@@ -246,8 +246,8 @@ lcd_enable_vcount_irq_at_150px: @ 8000594
 	thumb_func_end lcd_enable_vcount_irq_at_150px
 
 	thumb_func_start init_keypad_data
-@ void init_keypad_data()
-init_keypad_data: @ 80005BC
+; void init_keypad_data()
+init_keypad_data: ; 80005BC
 	ldr r1, =0x030026fc
 	movs r0, 0x5
 	strh r0, [r1]
@@ -267,8 +267,8 @@ init_keypad_data: @ 80005BC
 	thumb_func_end init_keypad_data
 
 	thumb_func_start load_keys
-@ void load_keys()
-load_keys: @ 80005E4
+; void load_keys()
+load_keys: ; 80005E4
 	push {lr}
 	ldr r0, =0x04000130
 	ldrh r1, [r0]
@@ -285,62 +285,62 @@ load_keys: @ 80005E4
 	strh r0, [r1, 0x30]
 	adds r2, r1, 0
 	cmp r3, 0
-	beq _08000630
+	beq @08000630
 	ldrh r0, [r2, 0x2C]
 	cmp r0, r3
-	bne _08000630
+	bne @08000630
 	ldrh r0, [r2, 0x32]
 	subs r0, 0x1
 	strh r0, [r2, 0x32]
 	lsls r0, 16
 	cmp r0, 0
-	bne _08000636
+	bne @08000636
 	strh r3, [r2, 0x30]
 	ldr r0, =0x030026fc
-	b _08000632
+	b @08000632
 	.align 2, 0
 	.pool
-_08000630:
+@08000630:
 	ldr r0, =0x030022b0
-_08000632:
+@08000632:
 	ldrh r0, [r0]
 	strh r0, [r2, 0x32]
-_08000636:
+@08000636:
 	strh r3, [r2, 0x28]
 	strh r3, [r2, 0x2C]
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x13]
 	cmp r0, 0x2
-	bne _08000668
+	bne @08000668
 	ldrh r1, [r2, 0x2E]
 	movs r3, 0x80
 	lsls r3, 2
 	adds r0, r3, 0
 	ands r0, r1
 	cmp r0, 0
-	beq _08000658
+	beq @08000658
 	movs r0, 0x1
 	orrs r0, r1
 	strh r0, [r2, 0x2E]
-_08000658:
+@08000658:
 	ldrh r1, [r2, 0x2C]
 	adds r0, r3, 0
 	ands r0, r1
 	cmp r0, 0
-	beq _08000668
+	beq @08000668
 	movs r0, 0x1
 	orrs r0, r1
 	strh r0, [r2, 0x2C]
-_08000668:
+@08000668:
 	ldrh r1, [r2, 0x2E]
 	ldrh r0, [r2, 0x36]
 	ands r0, r1
 	cmp r0, 0
-	beq _08000676
+	beq @08000676
 	movs r0, 0x1
 	strh r0, [r2, 0x34]
-_08000676:
+@08000676:
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -348,20 +348,20 @@ _08000676:
 	thumb_func_end load_keys
 
 	thumb_func_start init_irq_handler
-@ void init_irq_handler()
-init_irq_handler: @ 8000684
+; void init_irq_handler()
+init_irq_handler: ; 8000684
 	push {r4,r5,lr}
 	ldr r5, =InterruptMain
 	ldr r4, =0x03002750
 	ldr r3, =gRomInterruptTable
 	ldr r2, =0x03002710
 	movs r1, 0xD
-_08000690:
+@08000690:
 	ldm r3!, {r0}
 	stm r2!, {r0}
 	subs r1, 0x1
 	cmp r1, 0
-	bge _08000690
+	bge @08000690
 	ldr r0, =0x040000d4
 	str r5, [r0]
 	str r4, [r0, 0x4]
@@ -389,8 +389,8 @@ _08000690:
 	thumb_func_end init_irq_handler
 
 	thumb_func_start SetVBlankCallback
-@ void SetVBlankCallback(void ( *func)())
-SetVBlankCallback: @ 80006F0
+; void SetVBlankCallback(void ( *func)())
+SetVBlankCallback: ; 80006F0
 	ldr r1, =0x030022c0
 	str r0, [r1, 0xC]
 	bx lr
@@ -399,8 +399,8 @@ SetVBlankCallback: @ 80006F0
 	thumb_func_end SetVBlankCallback
 
 	thumb_func_start SetHBlankCallback
-@ void SetHBlankCallback(void ( *func)())
-SetHBlankCallback: @ 80006FC
+; void SetHBlankCallback(void ( *func)())
+SetHBlankCallback: ; 80006FC
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x10]
 	bx lr
@@ -409,7 +409,7 @@ SetHBlankCallback: @ 80006FC
 	thumb_func_end SetHBlankCallback
 
 	thumb_func_start SetVCountCallback
-SetVCountCallback: @ 8000708
+SetVCountCallback: ; 8000708
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x14]
 	bx lr
@@ -418,8 +418,8 @@ SetVCountCallback: @ 8000708
 	thumb_func_end SetVCountCallback
 
 	thumb_func_start restore_serial_timer3_irq_handlers
-@ void restore_serial_timer3_irq_handlers()
-restore_serial_timer3_irq_handlers: @ 8000714
+; void restore_serial_timer3_irq_handlers()
+restore_serial_timer3_irq_handlers: ; 8000714
 	ldr r0, =0x03002710
 	ldr r1, =irq_serial + 1
 	str r1, [r0, 0x4]
@@ -431,8 +431,8 @@ restore_serial_timer3_irq_handlers: @ 8000714
 	thumb_func_end restore_serial_timer3_irq_handlers
 
 	thumb_func_start set_serial_callback
-@ void set_serial_callback(void ( *func)())
-set_serial_callback: @ 800072C
+; void set_serial_callback(void ( *func)())
+set_serial_callback: ; 800072C
 	ldr r1, =0x030022c0
 	str r0, [r1, 0x18]
 	bx lr
@@ -441,24 +441,24 @@ set_serial_callback: @ 800072C
 	thumb_func_end set_serial_callback
 
 	thumb_func_start irq_vblank
-@ void irq_vblank()
-irq_vblank: @ 8000738
+; void irq_vblank()
+irq_vblank: ; 8000738
 	push {r4,lr}
 	ldr r0, =0x030030fc
 	ldrb r0, [r0]
 	cmp r0, 0
-	beq _0800074C
+	beq @0800074C
 	bl rfu_syncVBlank__
-	b _08000758
+	b @08000758
 	.align 2, 0
 	.pool
-_0800074C:
+@0800074C:
 	ldr r0, =0x03002748
 	ldrb r0, [r0]
 	cmp r0, 0
-	bne _08000758
+	bne @08000758
 	bl sub_800B9B8
-_08000758:
+@08000758:
 	ldr r0, =0x030022c0
 	ldr r1, [r0, 0x20]
 	adds r1, 0x1
@@ -467,20 +467,20 @@ _08000758:
 	ldr r1, [r1]
 	adds r4, r0, 0
 	cmp r1, 0
-	beq _08000778
+	beq @08000778
 	ldr r2, [r1]
 	movs r0, 0x2
 	negs r0, r0
 	cmp r2, r0
-	bhi _08000778
+	bhi @08000778
 	adds r0, r2, 0x1
 	str r0, [r1]
-_08000778:
+@08000778:
 	ldr r0, [r4, 0xC]
 	cmp r0, 0
-	beq _08000782
+	beq @08000782
 	bl _call_via_r0
-_08000782:
+@08000782:
 	ldr r0, [r4, 0x24]
 	adds r0, 0x1
 	str r0, [r4, 0x24]
@@ -498,16 +498,16 @@ _08000782:
 	movs r0, 0x2
 	ands r0, r1
 	cmp r0, 0
-	beq _080007BA
+	beq @080007BA
 	ldr r0, =0x02022fec
 	ldr r0, [r0]
 	ldr r1, =0x013f0102
 	ands r0, r1
 	cmp r0, 0
-	bne _080007BE
-_080007BA:
+	bne @080007BE
+@080007BA:
 	bl GenerateRandomNumber
-_080007BE:
+@080007BE:
 	bl sub_800E174
 	ldr r2, =0x03007ff8
 	ldrh r0, [r2]
@@ -527,8 +527,8 @@ _080007BE:
 	thumb_func_end irq_vblank
 
 	thumb_func_start flash_timeout_start_on_timer_2
-@ void flash_timeout_start_on_timer_2()
-flash_timeout_start_on_timer_2: @ 8000800
+; void flash_timeout_start_on_timer_2()
+flash_timeout_start_on_timer_2: ; 8000800
 	push {lr}
 	ldr r1, =0x0300272c
 	movs r0, 0x2
@@ -540,15 +540,15 @@ flash_timeout_start_on_timer_2: @ 8000800
 	thumb_func_end flash_timeout_start_on_timer_2
 
 	thumb_func_start irq_hblank
-@ void irq_hblank()
-irq_hblank: @ 8000814
+; void irq_hblank()
+irq_hblank: ; 8000814
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4, 0x10]
 	cmp r0, 0
-	beq _08000822
+	beq @08000822
 	bl _call_via_r0
-_08000822:
+@08000822:
 	ldr r2, =0x03007ff8
 	ldrh r0, [r2]
 	movs r1, 0x2
@@ -566,15 +566,15 @@ _08000822:
 	thumb_func_end irq_hblank
 
 	thumb_func_start irq_vcount
-@ void irq_vcount()
-irq_vcount: @ 8000844
+; void irq_vcount()
+irq_vcount: ; 8000844
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4, 0x14]
 	cmp r0, 0
-	beq _08000852
+	beq @08000852
 	bl _call_via_r0
-_08000852:
+@08000852:
 	bl SoundVSync_rev01
 	ldr r2, =0x03007ff8
 	ldrh r0, [r2]
@@ -593,15 +593,15 @@ _08000852:
 	thumb_func_end irq_vcount
 
 	thumb_func_start irq_serial
-@ void irq_serial()
-irq_serial: @ 8000878
+; void irq_serial()
+irq_serial: ; 8000878
 	push {r4,lr}
 	ldr r4, =0x030022c0
 	ldr r0, [r4, 0x18]
 	cmp r0, 0
-	beq _08000886
+	beq @08000886
 	bl _call_via_r0
-_08000886:
+@08000886:
 	ldr r2, =0x03007ff8
 	ldrh r0, [r2]
 	movs r1, 0x80
@@ -619,14 +619,14 @@ _08000886:
 	thumb_func_end irq_serial
 
 	thumb_func_start irq_other
-@ void irq_other()
-irq_other: @ 80008A8
+; void irq_other()
+irq_other: ; 80008A8
 	bx lr
 	thumb_func_end irq_other
 
 	thumb_func_start wait_for_vblank
-@ void wait_for_vblank()
-wait_for_vblank: @ 80008AC
+; void wait_for_vblank()
+wait_for_vblank: ; 80008AC
 	push {lr}
 	ldr r2, =0x030022c0
 	ldrh r1, [r2, 0x1C]
@@ -638,15 +638,15 @@ wait_for_vblank: @ 80008AC
 	movs r0, 0x1
 	ands r0, r1
 	cmp r0, 0
-	bne _080008D0
+	bne @080008D0
 	movs r3, 0x1
-_080008C6:
+@080008C6:
 	ldrh r1, [r2, 0x1C]
 	adds r0, r3, 0
 	ands r0, r1
 	cmp r0, 0
-	beq _080008C6
-_080008D0:
+	beq @080008C6
+@080008D0:
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -654,7 +654,7 @@ _080008D0:
 	thumb_func_end wait_for_vblank
 
 	thumb_func_start sub_80008DC
-sub_80008DC: @ 80008DC
+sub_80008DC: ; 80008DC
 	ldr r1, =0x0203cf5c
 	str r0, [r1]
 	bx lr
@@ -663,7 +663,7 @@ sub_80008DC: @ 80008DC
 	thumb_func_end sub_80008DC
 
 	thumb_func_start sub_80008E8
-sub_80008E8: @ 80008E8
+sub_80008E8: ; 80008E8
 	ldr r1, =0x0203cf5c
 	movs r0, 0
 	str r0, [r1]
@@ -673,8 +673,8 @@ sub_80008E8: @ 80008E8
 	thumb_func_end sub_80008E8
 
 	thumb_func_start do_reset
-@ void do_reset()
-do_reset: @ 80008F4
+; void do_reset()
+do_reset: ; 80008F4
 	push {r4,lr}
 	ldr r1, =0x04000208
 	movs r0, 0
@@ -722,7 +722,7 @@ do_reset: @ 80008F4
 	thumb_func_end do_reset
 
 	thumb_func_start sub_8000964
-sub_8000964: @ 8000964
+sub_8000964: ; 8000964
 	push {lr}
 	sub sp, 0x4
 	mov r1, sp