update for modified assembler

1 files changed, 693 insertions, 693 deletions

diff --git a/asm/gpu_bg.s b/asm/gpu_bg.s
index e304bb9ef..3e7f9cdf0 100644
--- a/asm/gpu_bg.s
+++ b/asm/gpu_bg.s
@@ -1,6 +1,6 @@
 	thumb_func_start gpu_init_bgs
-@ void gpu_init_bgs()
-gpu_init_bgs: @ 80012F0
+; void gpu_init_bgs()
+gpu_init_bgs: ; 80012F0
 	push {lr}
 	bl gpu_reset_bg_configs
 	ldr r1, =0x030008e0
@@ -14,8 +14,8 @@ gpu_init_bgs: @ 80012F0
 	thumb_func_end gpu_init_bgs
 
 	thumb_func_start gpu_set_bg_mode
-@ void gpu_set_bg_mode(u8 bg_mode)
-gpu_set_bg_mode: @ 8001308
+; void gpu_set_bg_mode(u8 bg_mode)
+gpu_set_bg_mode: ; 8001308
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =0x030008e0
@@ -30,8 +30,8 @@ gpu_set_bg_mode: @ 8001308
 	thumb_func_end gpu_set_bg_mode
 
 	thumb_func_start gpu_get_bg_mode
-@ u8 gpu_get_bg_mode()
-gpu_get_bg_mode: @ 8001324
+; u8 gpu_get_bg_mode()
+gpu_get_bg_mode: ; 8001324
 	ldr r0, =0x030008e0
 	ldrb r1, [r0, 0x10]
 	movs r0, 0x7
@@ -42,19 +42,19 @@ gpu_get_bg_mode: @ 8001324
 	thumb_func_end gpu_get_bg_mode
 
 	thumb_func_start gpu_reset_bg_configs
-@ void gpu_reset_bg_configs()
-gpu_reset_bg_configs: @ 8001334
+; void gpu_reset_bg_configs()
+gpu_reset_bg_configs: ; 8001334
 	push {lr}
 	ldr r2, =0x030008e0
 	ldr r0, =gBgConfigZeroValue
 	ldr r0, [r0]
 	adds r1, r2, 0
 	adds r1, 0xC
-_08001340:
+@08001340:
 	str r0, [r1]
 	subs r1, 0x4
 	cmp r1, r2
-	bge _08001340
+	bge @08001340
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -62,7 +62,7 @@ _08001340:
 	thumb_func_end gpu_reset_bg_configs
 
 	thumb_func_start sub_8001354
-sub_8001354: @ 8001354
+sub_8001354: ; 8001354
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -70,14 +70,14 @@ sub_8001354: @ 8001354
 	bl is_invalid_bg_id
 	lsls r0, 24
 	cmp r0, 0
-	bne _08001372
+	bne @08001372
 	ldr r1, =0x030008e0
 	lsls r0, r4, 2
 	adds r0, r1
 	ldr r1, =gBgConfigZeroValue
 	ldr r1, [r1]
 	str r1, [r0]
-_08001372:
+@08001372:
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -86,8 +86,8 @@ _08001372:
 	thumb_func_end sub_8001354
 
 	thumb_func_start gpu_bg_config_set_fields
-@ void gpu_bg_config_set_fields(u8 bg_id, u8 character_base_block, u8 screen_base_block, u8 screen_size, u8 palette_size_select, u8 priority, u8 mosaic, u8 wraparound)
-gpu_bg_config_set_fields: @ 8001380
+; void gpu_bg_config_set_fields(u8 bg_id, u8 character_base_block, u8 screen_base_block, u8 screen_size, u8 palette_size_select, u8 priority, u8 mosaic, u8 wraparound)
+gpu_bg_config_set_fields: ; 8001380
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -129,12 +129,12 @@ gpu_bg_config_set_fields: @ 8001380
 	lsrs r0, 24
 	mov r12, r0
 	cmp r0, 0
-	bne _08001498
+	bne @08001498
 	ldr r2, =0x030008e0
 	mov r8, r2
 	mov r0, r10
 	cmp r0, 0xFF
-	beq _080013F4
+	beq @080013F4
 	lsls r2, r7, 2
 	add r2, r8
 	movs r1, 0x3
@@ -145,9 +145,9 @@ gpu_bg_config_set_fields: @ 8001380
 	ands r0, r3
 	orrs r0, r1
 	strb r0, [r2, 0x1]
-_080013F4:
+@080013F4:
 	cmp r6, 0xFF
-	beq _0800140C
+	beq @0800140C
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x1F
@@ -158,10 +158,10 @@ _080013F4:
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1, 0x1]
-_0800140C:
+@0800140C:
 	mov r1, r9
 	cmp r1, 0xFF
-	beq _08001428
+	beq @08001428
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x3
@@ -173,10 +173,10 @@ _0800140C:
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-_08001428:
+@08001428:
 	ldr r6, [sp, 0x4]
 	cmp r6, 0xFF
-	beq _0800143E
+	beq @0800143E
 	lsls r1, r7, 2
 	add r1, r8
 	lsls r3, r6, 7
@@ -185,9 +185,9 @@ _08001428:
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1, 0x1]
-_0800143E:
+@0800143E:
 	cmp r5, 0xFF
-	beq _08001456
+	beq @08001456
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x3
@@ -198,9 +198,9 @@ _0800143E:
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-_08001456:
+@08001456:
 	cmp r4, 0xFF
-	beq _0800146E
+	beq @0800146E
 	lsls r1, r7, 2
 	add r1, r8
 	movs r0, 0x1
@@ -211,10 +211,10 @@ _08001456:
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-_0800146E:
+@0800146E:
 	ldr r0, [sp, 0xC]
 	cmp r0, 0xFF
-	beq _08001484
+	beq @08001484
 	lsls r1, r7, 2
 	add r1, r8
 	lsls r3, r0, 7
@@ -223,7 +223,7 @@ _0800146E:
 	ands r0, r2
 	orrs r0, r3
 	strb r0, [r1]
-_08001484:
+@08001484:
 	ldr r1, [sp]
 	lsls r0, r1, 2
 	add r0, r8
@@ -234,7 +234,7 @@ _08001484:
 	movs r2, 0x1
 	orrs r1, r2
 	strb r1, [r0]
-_08001498:
+@08001498:
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -248,8 +248,8 @@ _08001498:
 	thumb_func_end gpu_bg_config_set_fields
 
 	thumb_func_start gpu_bg_config_get_field
-@ int gpu_bg_config_get_field(u8 bg_id, u8 field_id)
-gpu_bg_config_get_field: @ 80014AC
+; int gpu_bg_config_get_field(u8 bg_id, u8 field_id)
+gpu_bg_config_get_field: ; 80014AC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -259,7 +259,7 @@ gpu_bg_config_get_field: @ 80014AC
 	bl is_invalid_bg_id
 	lsls r0, 24
 	cmp r0, 0
-	bne _08001558
+	bne @08001558
 	ldr r1, =0x030008e0
 	lsls r2, r4, 2
 	adds r0, r2, r1
@@ -267,84 +267,84 @@ gpu_bg_config_get_field: @ 80014AC
 	lsls r0, 31
 	adds r3, r1, 0
 	cmp r0, 0
-	beq _08001558
+	beq @08001558
 	subs r0, r5, 0x1
 	cmp r0, 0x7
-	bhi _08001558
+	bhi @08001558
 	lsls r0, 2
-	ldr r1, =_080014EC
+	ldr r1, =@080014EC
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_080014EC:
-	.4byte _0800150C
-	.4byte _08001516
-	.4byte _08001520
-	.4byte _0800152A
-	.4byte _08001534
-	.4byte _0800153C
-	.4byte _08001546
-	.4byte _08001550
-_0800150C:
+@080014EC:
+	.4byte @0800150C
+	.4byte @08001516
+	.4byte @08001520
+	.4byte @0800152A
+	.4byte @08001534
+	.4byte @0800153C
+	.4byte @08001546
+	.4byte @08001550
+@0800150C:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 31
 	lsrs r0, 31
-	b _0800155A
-_08001516:
+	b @0800155A
+@08001516:
 	adds r0, r2, r3
 	ldrb r0, [r0, 0x1]
 	lsls r0, 30
 	lsrs r0, 30
-	b _0800155A
-_08001520:
+	b @0800155A
+@08001520:
 	adds r0, r2, r3
 	ldrb r0, [r0, 0x1]
 	lsls r0, 25
 	lsrs r0, 27
-	b _0800155A
-_0800152A:
+	b @0800155A
+@0800152A:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 28
 	lsrs r0, 30
-	b _0800155A
-_08001534:
+	b @0800155A
+@08001534:
 	adds r0, r2, r3
 	ldrb r0, [r0, 0x1]
 	lsrs r0, 7
-	b _0800155A
-_0800153C:
+	b @0800155A
+@0800153C:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 26
 	lsrs r0, 30
-	b _0800155A
-_08001546:
+	b @0800155A
+@08001546:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsls r0, 25
 	lsrs r0, 31
-	b _0800155A
-_08001550:
+	b @0800155A
+@08001550:
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	lsrs r0, 7
-	b _0800155A
-_08001558:
+	b @0800155A
+@08001558:
 	movs r0, 0xFF
-_0800155A:
+@0800155A:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
 	thumb_func_end gpu_bg_config_get_field
 
 	thumb_func_start gpu_copy_to_vram_by_bg_id
-@ s8 gpu_copy_to_vram_by_bg_id(u8 bg_id, int src, u16 byte_count, u16 dest_offset, gpu_copy_to_vram_type type)
-gpu_copy_to_vram_by_bg_id: @ 8001560
+; s8 gpu_copy_to_vram_by_bg_id(u8 bg_id, int src, u16 byte_count, u16 dest_offset, gpu_copy_to_vram_type type)
+gpu_copy_to_vram_by_bg_id: ; 8001560
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -362,33 +362,33 @@ gpu_copy_to_vram_by_bg_id: @ 8001560
 	bl is_invalid_bg_id
 	lsls r0, 24
 	cmp r0, 0
-	bne _080015D8
+	bne @080015D8
 	ldr r1, =0x030008e0
 	lsls r0, r4, 2
 	adds r1, r0, r1
 	ldrb r0, [r1]
 	lsls r0, 31
 	cmp r0, 0
-	beq _080015D8
+	beq @080015D8
 	cmp r5, 0x1
-	beq _080015A4
+	beq @080015A4
 	cmp r5, 0x2
-	beq _080015AC
+	beq @080015AC
 	movs r2, 0xFF
-	b _080015DC
+	b @080015DC
 	.align 2, 0
 	.pool
-_080015A4:
+@080015A4:
 	ldrb r0, [r1, 0x1]
 	lsls r0, 30
 	lsrs r0, 16
-	b _080015B4
-_080015AC:
+	b @080015B4
+@080015AC:
 	ldrb r0, [r1, 0x1]
 	lsls r0, 25
 	lsrs r0, 27
 	lsls r0, 11
-_080015B4:
+@080015B4:
 	adds r0, r6, r0
 	lsls r0, 16
 	lsrs r0, 16
@@ -405,13 +405,13 @@ _080015B4:
 	movs r1, 0x1
 	negs r1, r1
 	cmp r0, r1
-	bne _080015DC
-_080015D8:
+	bne @080015DC
+@080015D8:
 	movs r0, 0xFF
-	b _080015DE
-_080015DC:
+	b @080015DE
+@080015DC:
 	adds r0, r2, 0
-_080015DE:
+@080015DE:
 	pop {r3}
 	mov r8, r3
 	pop {r4-r7}
@@ -420,8 +420,8 @@ _080015DE:
 	thumb_func_end gpu_copy_to_vram_by_bg_id
 
 	thumb_func_start gpu_bg_show
-@ void gpu_bg_show(u8 bg_id)
-gpu_bg_show: @ 80015E8
+; void gpu_bg_show(u8 bg_id)
+gpu_bg_show: ; 80015E8
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -429,14 +429,14 @@ gpu_bg_show: @ 80015E8
 	bl is_invalid_bg_id
 	lsls r0, 24
 	cmp r0, 0
-	bne _08001656
+	bne @08001656
 	ldr r5, =0x030008e0
 	lsls r0, r4, 2
 	adds r2, r0, r5
 	ldrb r3, [r2]
 	lsls r0, r3, 31
 	cmp r0, 0
-	beq _08001656
+	beq @08001656
 	lsls r1, r3, 26
 	lsrs r1, 30
 	ldrb r2, [r2, 0x1]
@@ -475,7 +475,7 @@ gpu_bg_show: @ 80015E8
 	ldr r1, =0x00000f07
 	ands r0, r1
 	strh r0, [r5, 0x10]
-_08001656:
+@08001656:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -484,8 +484,8 @@ _08001656:
 	thumb_func_end gpu_bg_show
 
 	thumb_func_start gpu_bg_hide
-@ void gpu_bg_hide(u8 bg_id)
-gpu_bg_hide: @ 8001664
+; void gpu_bg_hide(u8 bg_id)
+gpu_bg_hide: ; 8001664
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -493,7 +493,7 @@ gpu_bg_hide: @ 8001664
 	bl is_invalid_bg_id
 	lsls r0, 24
 	cmp r0, 0
-	bne _0800168A
+	bne @0800168A
 	ldr r2, =0x030008e0
 	adds r0, r4, 0
 	adds r0, 0x8
@@ -504,7 +504,7 @@ gpu_bg_hide: @ 8001664
 	ldr r1, =0x00000f07
 	ands r0, r1
 	strh r0, [r2, 0x10]
-_0800168A:
+@0800168A:
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -513,8 +513,8 @@ _0800168A:
 	thumb_func_end gpu_bg_hide
 
 	thumb_func_start gpu_sync_bg_visibility_and_mode
-@ void gpu_sync_bg_visibility_and_mode()
-gpu_sync_bg_visibility_and_mode: @ 8001698
+; void gpu_sync_bg_visibility_and_mode()
+gpu_sync_bg_visibility_and_mode: ; 8001698
 	push {lr}
 	movs r0, 0
 	bl lcd_io_get
@@ -532,8 +532,8 @@ gpu_sync_bg_visibility_and_mode: @ 8001698
 	thumb_func_end gpu_sync_bg_visibility_and_mode
 
 	thumb_func_start gpu_sync_text_mode_and_hide_bgs
-@ void gpu_sync_text_mode_and_hide_bgs()
-gpu_sync_text_mode_and_hide_bgs: @ 80016BC
+; void gpu_sync_text_mode_and_hide_bgs()
+gpu_sync_text_mode_and_hide_bgs: ; 80016BC
 	push {lr}
 	movs r0, 0
 	bl lcd_io_get
@@ -548,8 +548,8 @@ gpu_sync_text_mode_and_hide_bgs: @ 80016BC
 	thumb_func_end gpu_sync_text_mode_and_hide_bgs
 
 	thumb_func_start gpu_bg_affine_set
-@ void gpu_bg_affine_set(u8 bg_id, int bg_center_x, int bg_center_y, u16 display_center_x, s16 display_center_y, s16 scale_x, s16 scale_y, s16 rotation_angle)
-gpu_bg_affine_set: @ 80016D8
+; void gpu_bg_affine_set(u8 bg_id, int bg_center_x, int bg_center_y, u16 display_center_x, s16 display_center_y, s16 scale_x, s16 scale_y, s16 rotation_angle)
+gpu_bg_affine_set: ; 80016D8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -577,25 +577,25 @@ gpu_bg_affine_set: @ 80016D8
 	movs r1, 0x7
 	ands r1, r0
 	cmp r1, 0x1
-	beq _08001720
+	beq @08001720
 	cmp r1, 0x1
-	ble _08001796
+	ble @08001796
 	cmp r1, 0x2
-	beq _08001726
-	b _08001796
+	beq @08001726
+	b @08001796
 	.align 2, 0
 	.pool
-_08001720:
+@08001720:
 	cmp r6, 0x2
-	bne _08001796
-	b _08001730
-_08001726:
+	bne @08001796
+	b @08001730
+@08001726:
 	subs r0, r6, 0x2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
-	bhi _08001796
-_08001730:
+	bhi @08001796
+@08001730:
 	mov r0, r12
 	str r0, [sp]
 	mov r0, r8
@@ -637,7 +637,7 @@ _08001730:
 	ldrh r1, [r4, 0xE]
 	movs r0, 0x2E
 	bl lcd_io_set
-_08001796:
+@08001796:
 	add sp, 0x24
 	pop {r3}
 	mov r8, r3
@@ -647,32 +647,32 @@ _08001796:
 	thumb_func_end gpu_bg_affine_set
 
 	thumb_func_start is_invalid_bg_id
-@ _BOOL1 is_invalid_bg_id(u8 bg_id)
-is_invalid_bg_id: @ 80017A4
+; _BOOL1 is_invalid_bg_id(u8 bg_id)
+is_invalid_bg_id: ; 80017A4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
-	bhi _080017B2
+	bhi @080017B2
 	movs r0, 0
-	b _080017B4
-_080017B2:
+	b @080017B4
+@080017B2:
 	movs r0, 0x1
-_080017B4:
+@080017B4:
 	pop {r1}
 	bx r1
 	thumb_func_end is_invalid_bg_id
 
 	thumb_func_start do_nothing
-@ int do_nothing()
-do_nothing: @ 80017B8
+; int do_nothing()
+do_nothing: ; 80017B8
 	movs r0, 0
 	bx lr
 	thumb_func_end do_nothing
 
 	thumb_func_start gpu_reset_bgs_and_dma3_busy_flags
-@ void gpu_reset_bgs_and_dma3_busy_flags(int a1)
-gpu_reset_bgs_and_dma3_busy_flags: @ 80017BC
+; void gpu_reset_bgs_and_dma3_busy_flags(int a1)
+gpu_reset_bgs_and_dma3_busy_flags: ; 80017BC
 	push {r4,lr}
 	adds r4, r0, 0
 	bl gpu_init_bgs
@@ -680,11 +680,11 @@ gpu_reset_bgs_and_dma3_busy_flags: @ 80017BC
 	movs r2, 0
 	adds r0, r1, 0
 	adds r0, 0xC
-_080017CC:
+@080017CC:
 	str r2, [r0]
 	subs r0, 0x4
 	cmp r0, r1
-	bge _080017CC
+	bge @080017CC
 	ldr r0, =0x03002f54
 	str r4, [r0]
 	pop {r4}
@@ -695,8 +695,8 @@ _080017CC:
 	thumb_func_end gpu_reset_bgs_and_dma3_busy_flags
 
 	thumb_func_start bg_vram_setup
-@ void bg_vram_setup(u8 bg_mode, struct bg_config3 *bg_config3s, u8 entry_count)
-bg_vram_setup: @ 80017E8
+; void bg_vram_setup(u8 bg_mode, struct bg_config3 *bg_config3s, u8 entry_count)
+bg_vram_setup: ; 80017E8
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -711,7 +711,7 @@ bg_vram_setup: @ 80017E8
 	bl gpu_set_bg_mode
 	bl gpu_reset_bg_configs
 	cmp r4, 0
-	beq _08001894
+	beq @08001894
 	movs r7, 0
 	ldr r0, =0x030008f8
 	mov r9, r0
@@ -720,12 +720,12 @@ bg_vram_setup: @ 80017E8
 	mov r10, r2
 	adds r6, r5, 0
 	mov r8, r4
-_0800181A:
+@0800181A:
 	ldr r4, [r6]
 	lsls r0, r4, 30
 	lsrs r5, r0, 30
 	cmp r5, 0x3
-	bhi _08001886
+	bhi @08001886
 	lsls r1, r4, 28
 	lsrs r1, 30
 	lsls r2, r4, 23
@@ -774,15 +774,15 @@ _0800181A:
 	str r7, [r0]
 	add r4, r10
 	str r7, [r4]
-_08001886:
+@08001886:
 	adds r6, 0x4
 	movs r5, 0x1
 	negs r5, r5
 	add r8, r5
 	mov r0, r8
 	cmp r0, 0
-	bne _0800181A
-_08001894:
+	bne @0800181A
+@08001894:
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -796,8 +796,8 @@ _08001894:
 	thumb_func_end bg_vram_setup
 
 	thumb_func_start bg_init_bg_config_2_from_bg_config_3
-@ void bg_init_bg_config_2_from_bg_config_3(struct bg_config_3 *bg)
-bg_init_bg_config_2_from_bg_config_3: @ 80018B0
+; void bg_init_bg_config_2_from_bg_config_3(struct bg_config_3 *bg)
+bg_init_bg_config_2_from_bg_config_3: ; 80018B0
 	push {r4-r7,lr}
 	sub sp, 0x10
 	adds r7, r0, 0
@@ -805,7 +805,7 @@ bg_init_bg_config_2_from_bg_config_3: @ 80018B0
 	lsls r0, r4, 30
 	lsrs r5, r0, 30
 	cmp r5, 0x3
-	bhi _08001920
+	bhi @08001920
 	lsls r1, r4, 28
 	lsrs r1, 30
 	lsls r2, r4, 23
@@ -853,7 +853,7 @@ bg_init_bg_config_2_from_bg_config_3: @ 80018B0
 	adds r4, 0xC
 	adds r5, r4
 	str r6, [r5]
-_08001920:
+@08001920:
 	add sp, 0x10
 	pop {r4-r7}
 	pop {r0}
@@ -863,8 +863,8 @@ _08001920:
 	thumb_func_end bg_init_bg_config_2_from_bg_config_3
 
 	thumb_func_start call_gpu_set_bg_mode
-@ void call_gpu_set_bg_mode(u8 bg_id)
-call_gpu_set_bg_mode: @ 8001934
+; void call_gpu_set_bg_mode(u8 bg_id)
+call_gpu_set_bg_mode: ; 8001934
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -874,8 +874,8 @@ call_gpu_set_bg_mode: @ 8001934
 	thumb_func_end call_gpu_set_bg_mode
 
 	thumb_func_start gpu_copy_bg_tile_pattern_data_to_vram
-@ s16 gpu_copy_bg_tile_pattern_data_to_vram(u8 bg_id, int src, u16 size, u16 offset)
-gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944
+; s16 gpu_copy_bg_tile_pattern_data_to_vram(u8 bg_id, int src, u16 size, u16 offset)
+gpu_copy_bg_tile_pattern_data_to_vram: ; 8001944
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -893,7 +893,7 @@ gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	bne _08001980
+	bne @08001980
 	ldr r1, =0x030008f8
 	lsls r0, r5, 4
 	adds r0, r1
@@ -902,10 +902,10 @@ gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944
 	lsrs r0, 22
 	adds r0, r4
 	lsls r0, 21
-	b _08001990
+	b @08001990
 	.align 2, 0
 	.pool
-_08001980:
+@08001980:
 	ldr r1, =0x030008f8
 	lsls r0, r5, 4
 	adds r0, r1
@@ -914,7 +914,7 @@ _08001980:
 	lsrs r0, 22
 	adds r0, r4
 	lsls r0, 22
-_08001990:
+@08001990:
 	lsrs r4, r0, 16
 	movs r6, 0x1
 	str r6, [sp]
@@ -927,12 +927,12 @@ _08001990:
 	lsrs r1, r2, 24
 	adds r7, r1, 0
 	cmp r1, 0xFF
-	bne _080019B8
+	bne @080019B8
 	ldr r0, =0x0000ffff
-	b _080019E6
+	b @080019E6
 	.align 2, 0
 	.pool
-_080019B8:
+@080019B8:
 	ldr r0, =0x03000938
 	lsrs r2, 29
 	lsls r2, 2
@@ -947,16 +947,16 @@ _080019B8:
 	ldr r0, =0x03002f54
 	ldr r0, [r0]
 	cmp r0, 0x1
-	bne _080019E4
+	bne @080019E4
 	lsrs r1, r4, 5
 	mov r0, r8
 	lsrs r2, r0, 5
 	adds r0, r5, 0
 	movs r3, 0x1
 	bl do_nothing
-_080019E4:
+@080019E4:
 	adds r0, r7, 0
-_080019E6:
+@080019E6:
 	add sp, 0x4
 	pop {r3}
 	mov r8, r3
@@ -968,7 +968,7 @@ _080019E6:
 	thumb_func_end gpu_copy_bg_tile_pattern_data_to_vram
 
 	thumb_func_start gpu_copy_bg_tile_map_to_vram
-gpu_copy_bg_tile_map_to_vram: @ 80019FC
+gpu_copy_bg_tile_map_to_vram: ; 80019FC
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -983,7 +983,7 @@ gpu_copy_bg_tile_map_to_vram: @ 80019FC
 	lsls r2, r0, 24
 	lsrs r3, r2, 24
 	cmp r3, 0xFF
-	beq _08001A3C
+	beq @08001A3C
 	ldr r0, =0x03000938
 	lsrs r2, 29
 	lsls r2, 2
@@ -996,12 +996,12 @@ gpu_copy_bg_tile_map_to_vram: @ 80019FC
 	orrs r0, r1
 	str r0, [r2]
 	adds r0, r3, 0
-	b _08001A3E
+	b @08001A3E
 	.align 2, 0
 	.pool
-_08001A3C:
+@08001A3C:
 	ldr r0, =0x0000ffff
-_08001A3E:
+@08001A3E:
 	add sp, 0x4
 	pop {r4}
 	pop {r1}
@@ -1011,7 +1011,7 @@ _08001A3E:
 	thumb_func_end gpu_copy_bg_tile_map_to_vram
 
 	thumb_func_start unused_copy_palette
-unused_copy_palette: @ 8001A4C
+unused_copy_palette: ; 8001A4C
 	push {r4-r7,lr}
 	adds r7, r1, 0
 	lsls r0, 24
@@ -1023,7 +1023,7 @@ unused_copy_palette: @ 8001A4C
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08001A98
+	bne @08001A98
 	ldr r1, =0x030008f8
 	lsls r0, r4, 4
 	adds r0, r1
@@ -1047,19 +1047,19 @@ unused_copy_palette: @ 8001A4C
 	movs r0, 0x1
 	negs r0, r0
 	cmp r1, r0
-	bne _08001AA4
-_08001A98:
+	bne @08001AA4
+@08001A98:
 	ldr r0, =0x0000ffff
-	b _08001AC8
+	b @08001AC8
 	.align 2, 0
 	.pool
-_08001AA4:
+@08001AA4:
 	ldr r4, =0x03000938
 	adds r0, r1, 0
 	cmp r1, 0
-	bge _08001AAE
+	bge @08001AAE
 	adds r0, 0x1F
-_08001AAE:
+@08001AAE:
 	asrs r0, 5
 	lsls r2, r0, 2
 	adds r2, r4
@@ -1073,7 +1073,7 @@ _08001AAE:
 	orrs r0, r1
 	str r0, [r2]
 	lsrs r0, r3, 24
-_08001AC8:
+@08001AC8:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
@@ -1082,18 +1082,18 @@ _08001AC8:
 	thumb_func_end unused_copy_palette
 
 	thumb_func_start is_dma3_queue_busy_with_gpu_copy
-@ int is_dma3_queue_busy_with_gpu_copy()
-is_dma3_queue_busy_with_gpu_copy: @ 8001AD4
+; int is_dma3_queue_busy_with_gpu_copy()
+is_dma3_queue_busy_with_gpu_copy: ; 8001AD4
 	push {r4-r7,lr}
 	movs r5, 0
 	movs r7, 0x1
 	negs r7, r7
-_08001ADC:
+@08001ADC:
 	adds r0, r5, 0
 	cmp r5, 0
-	bge _08001AE4
+	bge @08001AE4
 	adds r0, 0x1F
-_08001AE4:
+@08001AE4:
 	asrs r0, 5
 	lsls r2, r0, 24
 	lsls r0, 5
@@ -1108,36 +1108,36 @@ _08001AE4:
 	ldr r0, [r4]
 	ands r0, r6
 	cmp r0, 0
-	beq _08001B22
+	beq @08001B22
 	lsls r0, r5, 16
 	asrs r0, 16
 	bl CheckForSpaceForDma3Request
 	lsls r0, 24
 	asrs r0, 24
 	cmp r0, r7
-	bne _08001B1C
+	bne @08001B1C
 	movs r0, 0x1
-	b _08001B2A
+	b @08001B2A
 	.align 2, 0
 	.pool
-_08001B1C:
+@08001B1C:
 	ldr r0, [r4]
 	bics r0, r6
 	str r0, [r4]
-_08001B22:
+@08001B22:
 	adds r5, 0x1
 	cmp r5, 0x7F
-	ble _08001ADC
+	ble @08001ADC
 	movs r0, 0
-_08001B2A:
+@08001B2A:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
 	thumb_func_end is_dma3_queue_busy_with_gpu_copy
 
 	thumb_func_start gpu_sync_bg_show
-@ void gpu_sync_bg_show(u8 bg_id)
-gpu_sync_bg_show: @ 8001B30
+; void gpu_sync_bg_show(u8 bg_id)
+gpu_sync_bg_show: ; 8001B30
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1148,8 +1148,8 @@ gpu_sync_bg_show: @ 8001B30
 	thumb_func_end gpu_sync_bg_show
 
 	thumb_func_start gpu_sync_bg_hide
-@ void gpu_sync_bg_hide(u8 bg_id)
-gpu_sync_bg_hide: @ 8001B44
+; void gpu_sync_bg_hide(u8 bg_id)
+gpu_sync_bg_hide: ; 8001B44
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1160,8 +1160,8 @@ gpu_sync_bg_hide: @ 8001B44
 	thumb_func_end gpu_sync_bg_hide
 
 	thumb_func_start gpu_bg_config_set_field
-@ int gpu_bg_config_set_field(u8 bg_id, bg_config_get_field field_id, u8 value)
-gpu_bg_config_set_field: @ 8001B58
+; int gpu_bg_config_set_field(u8 bg_id, bg_config_get_field field_id, u8 value)
+gpu_bg_config_set_field: ; 8001B58
 	push {r4,lr}
 	sub sp, 0x10
 	lsls r0, 24
@@ -1172,24 +1172,24 @@ gpu_bg_config_set_field: @ 8001B58
 	lsrs r3, r2, 24
 	subs r0, r1, 0x1
 	cmp r0, 0x6
-	bhi _08001C12
+	bhi @08001C12
 	lsls r0, 2
-	ldr r1, =_08001B7C
+	ldr r1, =@08001B7C
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08001B7C:
-	.4byte _08001B98
-	.4byte _08001BA8
-	.4byte _08001BBA
-	.4byte _08001BD0
-	.4byte _08001BE4
-	.4byte _08001BFC
-	.4byte _08001BDA
-_08001B98:
+@08001B7C:
+	.4byte @08001B98
+	.4byte @08001BA8
+	.4byte @08001BBA
+	.4byte @08001BD0
+	.4byte @08001BE4
+	.4byte @08001BFC
+	.4byte @08001BDA
+@08001B98:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1197,8 +1197,8 @@ _08001B98:
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	adds r1, r3, 0
-	b _08001BF2
-_08001BA8:
+	b @08001BF2
+@08001BA8:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1207,8 +1207,8 @@ _08001BA8:
 	adds r0, r4, 0
 	movs r1, 0xFF
 	adds r2, r3, 0
-	b _08001BF4
-_08001BBA:
+	b @08001BF4
+@08001BBA:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1218,35 +1218,35 @@ _08001BBA:
 	movs r1, 0xFF
 	movs r2, 0xFF
 	bl gpu_bg_config_set_fields
-	b _08001C12
-_08001BD0:
+	b @08001C12
+@08001BD0:
 	str r3, [sp]
 	movs r0, 0xFF
 	str r0, [sp, 0x4]
 	str r0, [sp, 0x8]
-	b _08001BEC
-_08001BDA:
+	b @08001BEC
+@08001BDA:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r3, [sp, 0x4]
 	str r0, [sp, 0x8]
-	b _08001BEC
-_08001BE4:
+	b @08001BEC
+@08001BE4:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
 	str r3, [sp, 0x8]
-_08001BEC:
+@08001BEC:
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	movs r1, 0xFF
-_08001BF2:
+@08001BF2:
 	movs r2, 0xFF
-_08001BF4:
+@08001BF4:
 	movs r3, 0xFF
 	bl gpu_bg_config_set_fields
-	b _08001C12
-_08001BFC:
+	b @08001C12
+@08001BFC:
 	movs r0, 0xFF
 	str r0, [sp]
 	str r0, [sp, 0x4]
@@ -1257,7 +1257,7 @@ _08001BFC:
 	movs r2, 0xFF
 	movs r3, 0xFF
 	bl gpu_bg_config_set_fields
-_08001C12:
+@08001C12:
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -1265,7 +1265,7 @@ _08001C12:
 	thumb_func_end gpu_bg_config_set_field
 
 	thumb_func_start bg_get_field
-bg_get_field: @ 8001C1C
+bg_get_field: ; 8001C1C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1273,104 +1273,104 @@ bg_get_field: @ 8001C1C
 	lsrs r1, 24
 	subs r0, r1, 0x1
 	cmp r0, 0x9
-	bhi _08001CF8
+	bhi @08001CF8
 	lsls r0, 2
-	ldr r1, =_08001C3C
+	ldr r1, =@08001C3C
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_08001C3C:
-	.4byte _08001C64
-	.4byte _08001C6E
-	.4byte _08001C78
-	.4byte _08001C82
-	.4byte _08001C96
-	.4byte _08001CA0
-	.4byte _08001C8C
-	.4byte _08001CAA
-	.4byte _08001CD8
-	.4byte _08001CE4
-_08001C64:
+@08001C3C:
+	.4byte @08001C64
+	.4byte @08001C6E
+	.4byte @08001C78
+	.4byte @08001C82
+	.4byte @08001C96
+	.4byte @08001CA0
+	.4byte @08001C8C
+	.4byte @08001CAA
+	.4byte @08001CD8
+	.4byte @08001CE4
+@08001C64:
 	adds r0, r4, 0
 	movs r1, 0x2
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001C6E:
+	b @08001CDE
+@08001C6E:
 	adds r0, r4, 0
 	movs r1, 0x3
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001C78:
+	b @08001CDE
+@08001C78:
 	adds r0, r4, 0
 	movs r1, 0x4
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001C82:
+	b @08001CDE
+@08001C82:
 	adds r0, r4, 0
 	movs r1, 0x5
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001C8C:
+	b @08001CDE
+@08001C8C:
 	adds r0, r4, 0
 	movs r1, 0x6
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001C96:
+	b @08001CDE
+@08001C96:
 	adds r0, r4, 0
 	movs r1, 0x7
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001CA0:
+	b @08001CDE
+@08001CA0:
 	adds r0, r4, 0
 	movs r1, 0x8
 	bl gpu_bg_config_get_field
-	b _08001CDE
-_08001CAA:
+	b @08001CDE
+@08001CAA:
 	adds r0, r4, 0
 	bl bg_get_type_by_bg_id
 	cmp r0, 0
-	beq _08001CBC
+	beq @08001CBC
 	cmp r0, 0x1
-	beq _08001CCA
+	beq @08001CCA
 	movs r0, 0
-	b _08001CFA
-_08001CBC:
+	b @08001CFA
+@08001CBC:
 	adds r0, r4, 0
 	movs r1, 0
 	bl bg_get_screen_size_in_regular_mode
 	lsls r0, 27
 	lsrs r0, 16
-	b _08001CFA
-_08001CCA:
+	b @08001CFA
+@08001CCA:
 	adds r0, r4, 0
 	movs r1, 0
 	bl bg_get_screen_size_in_affine_mode
 	lsls r0, 24
 	lsrs r0, 16
-	b _08001CFA
-_08001CD8:
+	b @08001CFA
+@08001CD8:
 	adds r0, r4, 0
 	bl bg_get_type_by_bg_id
-_08001CDE:
+@08001CDE:
 	lsls r0, 16
 	lsrs r0, 16
-	b _08001CFA
-_08001CE4:
+	b @08001CFA
+@08001CE4:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r1, r0
 	ldrh r0, [r1]
 	lsls r0, 22
 	lsrs r0, 22
-	b _08001CFA
+	b @08001CFA
 	.align 2, 0
 	.pool
-_08001CF8:
+@08001CF8:
 	ldr r0, =0x0000ffff
-_08001CFA:
+@08001CFA:
 	pop {r4}
 	pop {r1}
 	bx r1
@@ -1379,8 +1379,8 @@ _08001CFA:
 	thumb_func_end bg_get_field
 
 	thumb_func_start bg_change_x_offset
-@ int bg_change_x_offset(u8 bg_id, int offset, u8 operation)
-bg_change_x_offset: @ 8001D04
+; int bg_change_x_offset(u8 bg_id, int offset, u8 operation)
+bg_change_x_offset: ; 8001D04
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1390,106 +1390,106 @@ bg_change_x_offset: @ 8001D04
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08001D28
+	bne @08001D28
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	bne _08001D2E
-_08001D28:
+	bne @08001D2E
+@08001D28:
 	movs r0, 0x1
 	negs r0, r0
-	b _08001E34
-_08001D2E:
+	b @08001E34
+@08001D2E:
 	cmp r5, 0x1
-	beq _08001D4C
+	beq @08001D4C
 	cmp r5, 0x1
-	ble _08001D3A
+	ble @08001D3A
 	cmp r5, 0x2
-	beq _08001D60
-_08001D3A:
+	beq @08001D60
+@08001D3A:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x8
 	adds r0, r1, r0
 	str r6, [r0]
 	adds r5, r1, 0
-	b _08001D70
+	b @08001D70
 	.align 2, 0
 	.pool
-_08001D4C:
+@08001D4C:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0x8
 	adds r0, r2, r0
 	ldr r1, [r0]
 	adds r1, r6
-	b _08001D6C
+	b @08001D6C
 	.align 2, 0
 	.pool
-_08001D60:
+@08001D60:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0x8
 	adds r0, r2, r0
 	ldr r1, [r0]
 	subs r1, r6
-_08001D6C:
+@08001D6C:
 	str r1, [r0]
 	adds r5, r2, 0
-_08001D70:
+@08001D70:
 	bl gpu_get_bg_mode
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq _08001DAC
+	beq @08001DAC
 	cmp r4, 0x1
-	bgt _08001D8C
+	bgt @08001D8C
 	cmp r4, 0
-	beq _08001D96
-	b _08001E2C
+	beq @08001D96
+	b @08001E2C
 	.align 2, 0
 	.pool
-_08001D8C:
+@08001D8C:
 	cmp r4, 0x2
-	beq _08001DC0
+	beq @08001DC0
 	cmp r4, 0x3
-	beq _08001DF8
-	b _08001E2C
-_08001D96:
+	beq @08001DF8
+	b @08001E2C
+@08001D96:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x8]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x10
 	bl lcd_io_set
-	b _08001E2C
+	b @08001E2C
 	.align 2, 0
 	.pool
-_08001DAC:
+@08001DAC:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x18]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x14
 	bl lcd_io_set
-	b _08001E2C
+	b @08001E2C
 	.align 2, 0
 	.pool
-_08001DC0:
+@08001DC0:
 	cmp r0, 0
-	bne _08001DD8
+	bne @08001DD8
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x28]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x18
 	bl lcd_io_set
-	b _08001E2C
+	b @08001E2C
 	.align 2, 0
 	.pool
-_08001DD8:
+@08001DD8:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x28]
 	lsrs r1, r0, 16
@@ -1500,24 +1500,24 @@ _08001DD8:
 	movs r0, 0x28
 	adds r1, r4, 0
 	bl lcd_io_set
-	b _08001E2C
+	b @08001E2C
 	.align 2, 0
 	.pool
-_08001DF8:
+@08001DF8:
 	cmp r0, 0
-	bne _08001E10
+	bne @08001E10
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x38]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1C
 	bl lcd_io_set
-	b _08001E2C
+	b @08001E2C
 	.align 2, 0
 	.pool
-_08001E10:
+@08001E10:
 	cmp r0, 0x2
-	bne _08001E2C
+	bne @08001E2C
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x38]
 	lsrs r1, r0, 16
@@ -1528,12 +1528,12 @@ _08001E10:
 	movs r0, 0x38
 	adds r1, r4, 0
 	bl lcd_io_set
-_08001E2C:
+@08001E2C:
 	ldr r0, =0x030008f8
 	adds r0, 0x8
 	adds r0, r5, r0
 	ldr r0, [r0]
-_08001E34:
+@08001E34:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -1542,41 +1542,41 @@ _08001E34:
 	thumb_func_end bg_change_x_offset
 
 	thumb_func_start bg_get_x_offset
-@ int bg_get_x_offset(u8 bg_id)
-bg_get_x_offset: @ 8001E40
+; int bg_get_x_offset(u8 bg_id)
+bg_get_x_offset: ; 8001E40
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
 	adds r4, r0, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08001E70
+	bne @08001E70
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	beq _08001E70
+	beq @08001E70
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x8
 	adds r1, r0
 	ldr r0, [r1]
-	b _08001E74
+	b @08001E74
 	.align 2, 0
 	.pool
-_08001E70:
+@08001E70:
 	movs r0, 0x1
 	negs r0, r0
-_08001E74:
+@08001E74:
 	pop {r4}
 	pop {r1}
 	bx r1
 	thumb_func_end bg_get_x_offset
 
 	thumb_func_start bg_change_y_offset
-@ int bg_change_y_offset(u8 bg_id, int offset, u8 operation)
-bg_change_y_offset: @ 8001E7C
+; int bg_change_y_offset(u8 bg_id, int offset, u8 operation)
+bg_change_y_offset: ; 8001E7C
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1586,106 +1586,106 @@ bg_change_y_offset: @ 8001E7C
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08001EA0
+	bne @08001EA0
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	bne _08001EA6
-_08001EA0:
+	bne @08001EA6
+@08001EA0:
 	movs r0, 0x1
 	negs r0, r0
-	b _08001FAC
-_08001EA6:
+	b @08001FAC
+@08001EA6:
 	cmp r5, 0x1
-	beq _08001EC4
+	beq @08001EC4
 	cmp r5, 0x1
-	ble _08001EB2
+	ble @08001EB2
 	cmp r5, 0x2
-	beq _08001ED8
-_08001EB2:
+	beq @08001ED8
+@08001EB2:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0xC
 	adds r0, r1, r0
 	str r6, [r0]
 	adds r5, r1, 0
-	b _08001EE8
+	b @08001EE8
 	.align 2, 0
 	.pool
-_08001EC4:
+@08001EC4:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	adds r1, r6
-	b _08001EE4
+	b @08001EE4
 	.align 2, 0
 	.pool
-_08001ED8:
+@08001ED8:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	subs r1, r6
-_08001EE4:
+@08001EE4:
 	str r1, [r0]
 	adds r5, r2, 0
-_08001EE8:
+@08001EE8:
 	bl gpu_get_bg_mode
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq _08001F24
+	beq @08001F24
 	cmp r4, 0x1
-	bgt _08001F04
+	bgt @08001F04
 	cmp r4, 0
-	beq _08001F0E
-	b _08001FA4
+	beq @08001F0E
+	b @08001FA4
 	.align 2, 0
 	.pool
-_08001F04:
+@08001F04:
 	cmp r4, 0x2
-	beq _08001F38
+	beq @08001F38
 	cmp r4, 0x3
-	beq _08001F70
-	b _08001FA4
-_08001F0E:
+	beq @08001F70
+	b @08001FA4
+@08001F0E:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0xC]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x12
 	bl lcd_io_set
-	b _08001FA4
+	b @08001FA4
 	.align 2, 0
 	.pool
-_08001F24:
+@08001F24:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x1C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x16
 	bl lcd_io_set
-	b _08001FA4
+	b @08001FA4
 	.align 2, 0
 	.pool
-_08001F38:
+@08001F38:
 	cmp r0, 0
-	bne _08001F50
+	bne @08001F50
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1A
 	bl lcd_io_set
-	b _08001FA4
+	b @08001FA4
 	.align 2, 0
 	.pool
-_08001F50:
+@08001F50:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsrs r1, r0, 16
@@ -1696,24 +1696,24 @@ _08001F50:
 	movs r0, 0x2C
 	adds r1, r4, 0
 	bl lcd_io_set
-	b _08001FA4
+	b @08001FA4
 	.align 2, 0
 	.pool
-_08001F70:
+@08001F70:
 	cmp r0, 0
-	bne _08001F88
+	bne @08001F88
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1E
 	bl lcd_io_set
-	b _08001FA4
+	b @08001FA4
 	.align 2, 0
 	.pool
-_08001F88:
+@08001F88:
 	cmp r0, 0x2
-	bne _08001FA4
+	bne @08001FA4
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsrs r1, r0, 16
@@ -1724,12 +1724,12 @@ _08001F88:
 	movs r0, 0x3C
 	adds r1, r4, 0
 	bl lcd_io_set
-_08001FA4:
+@08001FA4:
 	ldr r0, =0x030008f8
 	adds r0, 0xC
 	adds r0, r5, r0
 	ldr r0, [r0]
-_08001FAC:
+@08001FAC:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -1738,8 +1738,8 @@ _08001FAC:
 	thumb_func_end bg_change_y_offset
 
 	thumb_func_start bg_change_y_offset_to_copy_queue
-@ int bg_change_y_offset_to_copy_queue(u8 bg_id, int a2, u8 a3)
-bg_change_y_offset_to_copy_queue: @ 8001FB8
+; int bg_change_y_offset_to_copy_queue(u8 bg_id, int a2, u8 a3)
+bg_change_y_offset_to_copy_queue: ; 8001FB8
 	push {r4-r6,lr}
 	adds r6, r1, 0
 	lsls r0, 24
@@ -1749,106 +1749,106 @@ bg_change_y_offset_to_copy_queue: @ 8001FB8
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08001FDC
+	bne @08001FDC
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	bne _08001FE2
-_08001FDC:
+	bne @08001FE2
+@08001FDC:
 	movs r0, 0x1
 	negs r0, r0
-	b _080020E8
-_08001FE2:
+	b @080020E8
+@08001FE2:
 	cmp r5, 0x1
-	beq _08002000
+	beq @08002000
 	cmp r5, 0x1
-	ble _08001FEE
+	ble @08001FEE
 	cmp r5, 0x2
-	beq _08002014
-_08001FEE:
+	beq @08002014
+@08001FEE:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0xC
 	adds r0, r1, r0
 	str r6, [r0]
 	adds r5, r1, 0
-	b _08002024
+	b @08002024
 	.align 2, 0
 	.pool
-_08002000:
+@08002000:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	adds r1, r6
-	b _08002020
+	b @08002020
 	.align 2, 0
 	.pool
-_08002014:
+@08002014:
 	ldr r0, =0x030008f8
 	lsls r2, r4, 4
 	adds r0, 0xC
 	adds r0, r2, r0
 	ldr r1, [r0]
 	subs r1, r6
-_08002020:
+@08002020:
 	str r1, [r0]
 	adds r5, r2, 0
-_08002024:
+@08002024:
 	bl gpu_get_bg_mode
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq _08002060
+	beq @08002060
 	cmp r4, 0x1
-	bgt _08002040
+	bgt @08002040
 	cmp r4, 0
-	beq _0800204A
-	b _080020E0
+	beq @0800204A
+	b @080020E0
 	.align 2, 0
 	.pool
-_08002040:
+@08002040:
 	cmp r4, 0x2
-	beq _08002074
+	beq @08002074
 	cmp r4, 0x3
-	beq _080020AC
-	b _080020E0
-_0800204A:
+	beq @080020AC
+	b @080020E0
+@0800204A:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0xC]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x12
 	bl lcd_io_set_forced_blank
-	b _080020E0
+	b @080020E0
 	.align 2, 0
 	.pool
-_08002060:
+@08002060:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x1C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x16
 	bl lcd_io_set_forced_blank
-	b _080020E0
+	b @080020E0
 	.align 2, 0
 	.pool
-_08002074:
+@08002074:
 	cmp r0, 0
-	bne _0800208C
+	bne @0800208C
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1A
 	bl lcd_io_set_forced_blank
-	b _080020E0
+	b @080020E0
 	.align 2, 0
 	.pool
-_0800208C:
+@0800208C:
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x2C]
 	lsrs r1, r0, 16
@@ -1859,24 +1859,24 @@ _0800208C:
 	movs r0, 0x2C
 	adds r1, r4, 0
 	bl lcd_io_set_forced_blank
-	b _080020E0
+	b @080020E0
 	.align 2, 0
 	.pool
-_080020AC:
+@080020AC:
 	cmp r0, 0
-	bne _080020C4
+	bne @080020C4
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsls r0, 8
 	lsrs r1, r0, 16
 	movs r0, 0x1E
 	bl lcd_io_set_forced_blank
-	b _080020E0
+	b @080020E0
 	.align 2, 0
 	.pool
-_080020C4:
+@080020C4:
 	cmp r0, 0x2
-	bne _080020E0
+	bne @080020E0
 	ldr r0, =0x030008f8
 	ldr r0, [r0, 0x3C]
 	lsrs r1, r0, 16
@@ -1887,12 +1887,12 @@ _080020C4:
 	movs r0, 0x3C
 	adds r1, r4, 0
 	bl lcd_io_set_forced_blank
-_080020E0:
+@080020E0:
 	ldr r0, =0x030008f8
 	adds r0, 0xC
 	adds r0, r5, r0
 	ldr r0, [r0]
-_080020E8:
+@080020E8:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
@@ -1901,41 +1901,41 @@ _080020E8:
 	thumb_func_end bg_change_y_offset_to_copy_queue
 
 	thumb_func_start bg_get_y_offset
-@ int bg_get_y_offset(u8 bg_id)
-bg_get_y_offset: @ 80020F4
+; int bg_get_y_offset(u8 bg_id)
+bg_get_y_offset: ; 80020F4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
 	adds r4, r0, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08002124
+	bne @08002124
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	beq _08002124
+	beq @08002124
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0xC
 	adds r1, r0
 	ldr r0, [r1]
-	b _08002128
+	b @08002128
 	.align 2, 0
 	.pool
-_08002124:
+@08002124:
 	movs r0, 0x1
 	negs r0, r0
-_08002128:
+@08002128:
 	pop {r4}
 	pop {r1}
 	bx r1
 	thumb_func_end bg_get_y_offset
 
 	thumb_func_start call_gpu_bg_affine_set
-@ void call_gpu_bg_affine_set(u8 a1, int a2, int a3, u16 a4, s16 a5, s16 a6, s16 a7, s16 a8)
-call_gpu_bg_affine_set: @ 8002130
+; void call_gpu_bg_affine_set(u8 a1, int a2, int a3, u16 a4, s16 a5, s16 a6, s16 a7, s16 a8)
+call_gpu_bg_affine_set: ; 8002130
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1970,7 +1970,7 @@ call_gpu_bg_affine_set: @ 8002130
 	thumb_func_end call_gpu_bg_affine_set
 
 	thumb_func_start mosaic_something
-mosaic_something: @ 8002170
+mosaic_something: ; 8002170
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1989,86 +1989,86 @@ mosaic_something: @ 8002170
 	lsls r0, 8
 	ands r5, r0
 	cmp r6, 0x6
-	bhi _080021C4
+	bhi @080021C4
 	lsls r0, r6, 2
-	ldr r1, =_080021A8
+	ldr r1, =@080021A8
 	adds r0, r1
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
 	.pool
 	.align 2, 0
-_080021A8:
-	.4byte _080021C4
-	.4byte _080021CC
-	.4byte _080021D2
-	.4byte _080021E4
-	.4byte _080021FA
-	.4byte _08002200
-	.4byte _08002212
-_080021C4:
+@080021A8:
+	.4byte @080021C4
+	.4byte @080021CC
+	.4byte @080021D2
+	.4byte @080021E4
+	.4byte @080021FA
+	.4byte @08002200
+	.4byte @08002212
+@080021C4:
 	movs r3, 0xF
 	ands r3, r4
 	lsrs r2, r4, 4
-	b _08002226
-_080021CC:
+	b @08002226
+@080021CC:
 	movs r3, 0xF
 	ands r3, r4
-	b _08002226
-_080021D2:
+	b @08002226
+@080021D2:
 	lsls r0, r3, 16
 	asrs r0, 16
 	adds r0, r4
 	cmp r0, 0xF
-	ble _080021E0
+	ble @080021E0
 	movs r3, 0xF
-	b _08002226
-_080021E0:
+	b @08002226
+@080021E0:
 	adds r0, r3, r4
-	b _080021F4
-_080021E4:
+	b @080021F4
+@080021E4:
 	lsls r0, r3, 16
 	asrs r0, 16
 	subs r0, r4
 	cmp r0, 0
-	bge _080021F2
+	bge @080021F2
 	movs r3, 0
-	b _08002226
-_080021F2:
+	b @08002226
+@080021F2:
 	subs r0, r3, r4
-_080021F4:
+@080021F4:
 	lsls r0, 16
 	lsrs r3, r0, 16
-	b _08002226
-_080021FA:
+	b @08002226
+@080021FA:
 	movs r2, 0xF
 	ands r2, r4
-	b _08002226
-_08002200:
+	b @08002226
+@08002200:
 	lsls r0, r2, 16
 	asrs r0, 16
 	adds r0, r4
 	cmp r0, 0xF
-	ble _0800220E
+	ble @0800220E
 	movs r2, 0xF
-	b _08002226
-_0800220E:
+	b @08002226
+@0800220E:
 	adds r0, r2, r4
-	b _08002222
-_08002212:
+	b @08002222
+@08002212:
 	lsls r0, r2, 16
 	asrs r0, 16
 	subs r0, r4
 	cmp r0, 0
-	bge _08002220
+	bge @08002220
 	movs r2, 0
-	b _08002226
-_08002220:
+	b @08002226
+@08002220:
 	subs r0, r2, r4
-_08002222:
+@08002222:
 	lsls r0, 16
 	lsrs r2, r0, 16
-_08002226:
+@08002226:
 	lsls r0, r2, 16
 	asrs r0, 12
 	movs r1, 0xF0
@@ -2092,8 +2092,8 @@ _08002226:
 	thumb_func_end mosaic_something
 
 	thumb_func_start bg_set_tilemap
-@ void bg_set_tilemap(u8 bg_id, int tilemap)
-bg_set_tilemap: @ 8002250
+; void bg_set_tilemap(u8 bg_id, int tilemap)
+bg_set_tilemap: ; 8002250
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	lsls r0, 24
@@ -2101,19 +2101,19 @@ bg_set_tilemap: @ 8002250
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _0800227A
+	bne @0800227A
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	beq _0800227A
+	beq @0800227A
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
 	adds r1, r0
 	str r5, [r1]
-_0800227A:
+@0800227A:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -2122,8 +2122,8 @@ _0800227A:
 	thumb_func_end bg_set_tilemap
 
 	thumb_func_start bg_unset_tilemap
-@ void bg_unset_tilemap(u8 bg_id)
-bg_unset_tilemap: @ 8002284
+; void bg_unset_tilemap(u8 bg_id)
+bg_unset_tilemap: ; 8002284
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2131,19 +2131,19 @@ bg_unset_tilemap: @ 8002284
 	bl is_invalid_bg_id_2
 	adds r5, r0, 0
 	cmp r5, 0
-	bne _080022AE
+	bne @080022AE
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	beq _080022AE
+	beq @080022AE
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
 	adds r1, r0
 	str r5, [r1]
-_080022AE:
+@080022AE:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -2152,40 +2152,40 @@ _080022AE:
 	thumb_func_end bg_unset_tilemap
 
 	thumb_func_start bg_get_tilemap
-@ int bg_get_tilemap(u8 bg_id)
-bg_get_tilemap: @ 80022B8
+; int bg_get_tilemap(u8 bg_id)
+bg_get_tilemap: ; 80022B8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
 	adds r4, r0, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _080022E8
+	bne @080022E8
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl gpu_bg_config_get_field
 	lsls r0, 16
 	cmp r0, 0
-	beq _080022E8
+	beq @080022E8
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
 	adds r1, r0
 	ldr r0, [r1]
-	b _080022EA
+	b @080022EA
 	.align 2, 0
 	.pool
-_080022E8:
+@080022E8:
 	movs r0, 0
-_080022EA:
+@080022EA:
 	pop {r4}
 	pop {r1}
 	bx r1
 	thumb_func_end bg_get_tilemap
 
 	thumb_func_start gpu_copy_to_wram_bg_tile_map
-@ void gpu_copy_to_wram_bg_tile_map(u8 bg_id, void *src, int mode, int dest_offset)
-gpu_copy_to_wram_bg_tile_map: @ 80022F0
+; void gpu_copy_to_wram_bg_tile_map(u8 bg_id, void *src, int mode, int dest_offset)
+gpu_copy_to_wram_bg_tile_map: ; 80022F0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2203,13 +2203,13 @@ gpu_copy_to_wram_bg_tile_map: @ 80022F0
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _08002358
+	bne @08002358
 	adds r0, r4, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne _08002358
+	bne @08002358
 	cmp r6, 0
-	beq _08002340
+	beq @08002340
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
@@ -2220,10 +2220,10 @@ gpu_copy_to_wram_bg_tile_map: @ 80022F0
 	lsrs r2, r7, 17
 	mov r0, r10
 	bl CpuSet
-	b _08002358
+	b @08002358
 	.align 2, 0
 	.pool
-_08002340:
+@08002340:
 	ldr r0, =0x030008f8
 	mov r2, r9
 	lsls r1, r2, 4
@@ -2235,7 +2235,7 @@ _08002340:
 	adds r1, r0
 	mov r0, r10
 	bl LZ77UnCompWram
-_08002358:
+@08002358:
 	pop {r3-r5}
 	mov r8, r3
 	mov r9, r4
@@ -2248,8 +2248,8 @@ _08002358:
 	thumb_func_end gpu_copy_to_wram_bg_tile_map
 
 	thumb_func_start gpu_copy_wram_bg_tilemap_to_vram
-@ void gpu_copy_wram_bg_tilemap_to_vram(int bg_id)
-gpu_copy_wram_bg_tilemap_to_vram: @ 800236C
+; void gpu_copy_wram_bg_tilemap_to_vram(int bg_id)
+gpu_copy_wram_bg_tilemap_to_vram: ; 800236C
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -2257,33 +2257,33 @@ gpu_copy_wram_bg_tilemap_to_vram: @ 800236C
 	adds r0, r4, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _080023C8
+	bne @080023C8
 	adds r0, r4, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne _080023C8
+	bne @080023C8
 	adds r0, r4, 0
 	bl bg_get_type_by_bg_id
 	cmp r0, 0
-	beq _0800239A
+	beq @0800239A
 	cmp r0, 0x1
-	beq _080023A6
+	beq @080023A6
 	movs r2, 0
-	b _080023B2
-_0800239A:
+	b @080023B2
+@0800239A:
 	adds r0, r4, 0
 	movs r1, 0
 	bl bg_get_screen_size_in_regular_mode
 	lsls r0, 27
-	b _080023B0
-_080023A6:
+	b @080023B0
+@080023A6:
 	adds r0, r4, 0
 	movs r1, 0
 	bl bg_get_screen_size_in_affine_mode
 	lsls r0, 24
-_080023B0:
+@080023B0:
 	lsrs r2, r0, 16
-_080023B2:
+@080023B2:
 	ldr r0, =0x030008f8
 	lsls r1, r4, 4
 	adds r0, 0x4
@@ -2294,7 +2294,7 @@ _080023B2:
 	adds r0, r4, 0
 	movs r3, 0
 	bl gpu_copy_to_vram_by_bg_id
-_080023C8:
+@080023C8:
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
@@ -2304,8 +2304,8 @@ _080023C8:
 	thumb_func_end gpu_copy_wram_bg_tilemap_to_vram
 
 	thumb_func_start gpu_copy_to_iwram_tile_map_rect
-@ void gpu_copy_to_iwram_tile_map_rect(u8 bg_id, int first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles)
-gpu_copy_to_iwram_tile_map_rect: @ 80023D4
+; void gpu_copy_to_iwram_tile_map_rect(u8 bg_id, int first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles)
+gpu_copy_to_iwram_tile_map_rect: ; 80023D4
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2330,41 +2330,41 @@ gpu_copy_to_iwram_tile_map_rect: @ 80023D4
 	adds r0, r5, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _080024C4
+	bne @080024C4
 	adds r0, r5, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne _080024C4
+	bne @080024C4
 	adds r0, r5, 0
 	bl bg_get_type_by_bg_id
 	cmp r0, 0
-	beq _08002422
+	beq @08002422
 	cmp r0, 0x1
-	beq _08002470
-	b _080024C4
-_08002422:
+	beq @08002470
+	b @080024C4
+@08002422:
 	mov r4, r8
 	adds r3, r7, 0
 	adds r0, r3, r6
 	cmp r3, r0
-	bge _080024C4
+	bge @080024C4
 	mov r12, r0
 	lsls r1, r5, 4
 	ldr r0, =0x030008fc
 	adds r1, r0
 	mov r8, r1
-_08002436:
+@08002436:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r7, r3, 0x1
 	cmp r2, r0
-	bge _08002460
+	bge @08002460
 	mov r1, r8
 	ldr r6, [r1]
 	lsls r5, r3, 5
 	adds r3, r0, 0
-_0800244A:
+@0800244A:
 	adds r0, r5, r2
 	lsls r0, 1
 	adds r0, r6
@@ -2375,16 +2375,16 @@ _0800244A:
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r3
-	blt _0800244A
-_08002460:
+	blt @0800244A
+@08002460:
 	lsls r0, r7, 16
 	lsrs r3, r0, 16
 	cmp r3, r12
-	blt _08002436
-	b _080024C4
+	blt @08002436
+	b @080024C4
 	.align 2, 0
 	.pool
-_08002470:
+@08002470:
 	mov r4, r8
 	adds r0, r5, 0
 	movs r1, 0x1
@@ -2395,24 +2395,24 @@ _08002470:
 	adds r3, r7, 0
 	adds r0, r3, r6
 	cmp r3, r0
-	bge _080024C4
+	bge @080024C4
 	mov r12, r0
 	lsls r5, 4
 	mov r8, r5
-_0800248E:
+@0800248E:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r7, r3, 0x1
 	cmp r2, r0
-	bge _080024BC
+	bge @080024BC
 	ldr r6, =0x030008fc
 	add r6, r8
 	ldr r1, [sp]
 	adds r5, r3, 0
 	muls r5, r1
 	adds r3, r0, 0
-_080024A6:
+@080024A6:
 	ldr r1, [r6]
 	adds r0, r5, r2
 	adds r1, r0
@@ -2423,13 +2423,13 @@ _080024A6:
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r3
-	blt _080024A6
-_080024BC:
+	blt @080024A6
+@080024BC:
 	lsls r0, r7, 16
 	lsrs r3, r0, 16
 	cmp r3, r12
-	blt _0800248E
-_080024C4:
+	blt @0800248E
+@080024C4:
 	add sp, 0x4
 	pop {r3-r5}
 	mov r8, r3
@@ -2443,8 +2443,8 @@ _080024C4:
 	thumb_func_end gpu_copy_to_iwram_tile_map_rect
 
 	thumb_func_start bg_copy_tilemap_rect_simple
-@ void bg_copy_tilemap_rect_simple(u8 bg_id, void *src, u8 dest_x, u8 dest_y, u8 w, u8 h, u8 a7)
-bg_copy_tilemap_rect_simple: @ 80024D8
+; void bg_copy_tilemap_rect_simple(u8 bg_id, void *src, u8 dest_x, u8 dest_y, u8 w, u8 h, u8 a7)
+bg_copy_tilemap_rect_simple: ; 80024D8
 	push {r4-r6,lr}
 	sub sp, 0x24
 	ldr r4, [sp, 0x34]
@@ -2481,8 +2481,8 @@ bg_copy_tilemap_rect_simple: @ 80024D8
 	thumb_func_end bg_copy_tilemap_rect_simple
 
 	thumb_func_start bg_copy_tilemap_rect
-@ void bg_copy_tilemap_rect(u8 bg_id, void *src, u8 src_x, u8 src_y, u8 src_w, int src_h, u8 dest_x, u8 dest_y, u8 dest_w, u8 dest_h, u8 a11, int tile_num_delta, s16 a13)
-bg_copy_tilemap_rect: @ 800251C
+; void bg_copy_tilemap_rect(u8 bg_id, void *src, u8 src_x, u8 src_y, u8 src_w, int src_h, u8 dest_x, u8 dest_y, u8 dest_w, u8 dest_h, u8 a11, int tile_num_delta, s16 a13)
+bg_copy_tilemap_rect: ; 800251C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2539,15 +2539,15 @@ bg_copy_tilemap_rect: @ 800251C
 	ldr r0, [sp, 0x4]
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	beq _08002592
-	b _080026EE
-_08002592:
+	beq @08002592
+	b @080026EE
+@08002592:
 	ldr r0, [sp, 0x4]
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	beq _0800259E
-	b _080026EE
-_0800259E:
+	beq @0800259E
+	b @080026EE
+@0800259E:
 	ldr r0, [sp, 0x4]
 	movs r1, 0x4
 	bl gpu_bg_config_get_field
@@ -2569,11 +2569,11 @@ _0800259E:
 	ldr r0, [sp, 0x4]
 	bl bg_get_type_by_bg_id
 	cmp r0, 0
-	beq _080025D8
+	beq @080025D8
 	cmp r0, 0x1
-	beq _08002674
-	b _080026EE
-_080025D8:
+	beq @08002674
+	b @080026EE
+@080025D8:
 	ldr r1, [sp, 0x10]
 	adds r0, r1, 0
 	muls r0, r7
@@ -2584,21 +2584,21 @@ _080025D8:
 	adds r6, r1, r0
 	adds r0, r5, r4
 	cmp r5, r0
-	blt _080025F0
-	b _080026EE
-_080025F0:
+	blt @080025F0
+	b @080026EE
+@080025F0:
 	ldr r2, [sp, 0x18]
 	subs r2, r7, r2
 	str r2, [sp, 0x34]
 	str r0, [sp, 0x38]
-_080025F8:
+@080025F8:
 	ldr r4, [sp, 0x14]
 	ldr r7, [sp, 0x18]
 	adds r0, r4, r7
 	adds r1, r5, 0x1
 	str r1, [sp, 0x3C]
 	cmp r4, r0
-	bge _0800265A
+	bge @0800265A
 	ldr r2, [sp, 0x4]
 	lsls r0, r2, 4
 	ldr r1, =0x030008fc
@@ -2611,7 +2611,7 @@ _080025F8:
 	lsls r0, r1, 16
 	asrs r0, 16
 	mov r8, r0
-_0800261E:
+@0800261E:
 	ldr r2, [sp, 0x2C]
 	str r2, [sp]
 	adds r0, r4, 0
@@ -2639,8 +2639,8 @@ _0800261E:
 	ldr r2, [sp, 0x18]
 	adds r0, r1, r2
 	cmp r4, r0
-	blt _0800261E
-_0800265A:
+	blt @0800261E
+@0800265A:
 	ldr r5, [sp, 0x34]
 	lsls r0, r5, 1
 	adds r6, r0
@@ -2649,11 +2649,11 @@ _0800265A:
 	lsrs r5, r0, 16
 	ldr r0, [sp, 0x38]
 	cmp r5, r0
-	blt _080025F8
-	b _080026EE
+	blt @080025F8
+	b @080026EE
 	.align 2, 0
 	.pool
-_08002674:
+@08002674:
 	ldr r1, [sp, 0x10]
 	adds r0, r1, 0
 	muls r0, r7
@@ -2669,7 +2669,7 @@ _08002674:
 	mov r9, r0
 	adds r0, r5, r4
 	cmp r5, r0
-	bge _080026EE
+	bge @080026EE
 	ldr r2, [sp, 0x18]
 	subs r2, r7, r2
 	str r2, [sp, 0x34]
@@ -2679,21 +2679,21 @@ _08002674:
 	ldr r0, [sp, 0x4]
 	lsls r0, 4
 	mov r8, r0
-_080026A8:
+@080026A8:
 	ldr r4, [sp, 0x14]
 	ldr r1, [sp, 0x18]
 	adds r0, r4, r1
 	adds r2, r5, 0x1
 	str r2, [sp, 0x3C]
 	cmp r4, r0
-	bge _080026DE
+	bge @080026DE
 	mov r3, r8
 	add r3, r10
 	mov r7, r9
 	muls r7, r5
 	mov r12, r7
 	adds r2, r0, 0
-_080026C2:
+@080026C2:
 	ldr r1, [r3]
 	mov r5, r12
 	adds r0, r5, r4
@@ -2707,8 +2707,8 @@ _080026C2:
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, r2
-	blt _080026C2
-_080026DE:
+	blt @080026C2
+@080026DE:
 	ldr r0, [sp, 0x34]
 	adds r6, r0
 	ldr r1, [sp, 0x3C]
@@ -2716,8 +2716,8 @@ _080026DE:
 	lsrs r5, r0, 16
 	ldr r2, [sp, 0x38]
 	cmp r5, r2
-	blt _080026A8
-_080026EE:
+	blt @080026A8
+@080026EE:
 	add sp, 0x40
 	pop {r3-r5}
 	mov r8, r3
@@ -2731,8 +2731,8 @@ _080026EE:
 	thumb_func_end bg_copy_tilemap_rect
 
 	thumb_func_start bg_fill_tilemap_rect
-@ void bg_fill_tilemap_rect(u8 bg_id, s16 tile, u8 x, u8 y, u8 w, u8 h)
-bg_fill_tilemap_rect: @ 8002704
+; void bg_fill_tilemap_rect(u8 bg_id, s16 tile, u8 x, u8 y, u8 w, u8 h)
+bg_fill_tilemap_rect: ; 8002704
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2759,40 +2759,40 @@ bg_fill_tilemap_rect: @ 8002704
 	adds r0, r6, 0
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	bne _080027F0
+	bne @080027F0
 	adds r0, r6, 0
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	bne _080027F0
+	bne @080027F0
 	adds r0, r6, 0
 	bl bg_get_type_by_bg_id
 	cmp r0, 0
-	beq _08002756
+	beq @08002756
 	cmp r0, 0x1
-	beq _080027A0
-	b _080027F0
-_08002756:
+	beq @080027A0
+	b @080027F0
+@08002756:
 	adds r3, r7, 0
 	adds r5, r3, r5
 	cmp r3, r5
-	bge _080027F0
+	bge @080027F0
 	adds r7, r5, 0
 	lsls r1, r6, 4
 	ldr r0, =0x030008fc
 	adds r1, r0
 	mov r12, r1
-_08002768:
+@08002768:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r6, r3, 0x1
 	cmp r2, r0
-	bge _08002790
+	bge @08002790
 	mov r5, r12
 	ldr r4, [r5]
 	lsls r3, 5
 	adds r1, r0, 0
-_0800277C:
+@0800277C:
 	adds r0, r3, r2
 	lsls r0, 1
 	adds r0, r4
@@ -2802,16 +2802,16 @@ _0800277C:
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r1
-	blt _0800277C
-_08002790:
+	blt @0800277C
+@08002790:
 	lsls r0, r6, 16
 	lsrs r3, r0, 16
 	cmp r3, r7
-	blt _08002768
-	b _080027F0
+	blt @08002768
+	b @080027F0
 	.align 2, 0
 	.pool
-_080027A0:
+@080027A0:
 	adds r0, r6, 0
 	movs r1, 0x1
 	bl bg_get_screen_size_in_affine_mode
@@ -2821,24 +2821,24 @@ _080027A0:
 	adds r3, r7, 0
 	adds r5, r3, r5
 	cmp r3, r5
-	bge _080027F0
+	bge @080027F0
 	adds r7, r5, 0
 	lsls r6, 4
 	mov r12, r6
-_080027BC:
+@080027BC:
 	mov r2, r10
 	mov r1, r9
 	adds r0, r2, r1
 	adds r6, r3, 0x1
 	cmp r2, r0
-	bge _080027E8
+	bge @080027E8
 	ldr r5, =0x030008fc
 	add r5, r12
 	ldr r1, [sp]
 	adds r4, r3, 0
 	muls r4, r1
 	adds r3, r0, 0
-_080027D4:
+@080027D4:
 	ldr r0, [r5]
 	adds r1, r4, r2
 	adds r0, r1
@@ -2848,13 +2848,13 @@ _080027D4:
 	lsls r0, 16
 	lsrs r2, r0, 16
 	cmp r2, r3
-	blt _080027D4
-_080027E8:
+	blt @080027D4
+@080027E8:
 	lsls r0, r6, 16
 	lsrs r3, r0, 16
 	cmp r3, r7
-	blt _080027BC
-_080027F0:
+	blt @080027BC
+@080027F0:
 	add sp, 0x4
 	pop {r3-r5}
 	mov r8, r3
@@ -2868,8 +2868,8 @@ _080027F0:
 	thumb_func_end bg_fill_tilemap_rect
 
 	thumb_func_start Bg_FillWramTileMapRectWithTileAndPalette
-@ void Bg_FillWramTileMapRectWithTileAndPalette(u8 bg_id, s16 tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette)
-Bg_FillWramTileMapRectWithTileAndPalette: @ 8002804
+; void Bg_FillWramTileMapRectWithTileAndPalette(u8 bg_id, s16 tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette)
+Bg_FillWramTileMapRectWithTileAndPalette: ; 8002804
 	push {r4-r6,lr}
 	sub sp, 0x10
 	ldr r4, [sp, 0x20]
@@ -2902,8 +2902,8 @@ Bg_FillWramTileMapRectWithTileAndPalette: @ 8002804
 	thumb_func_end Bg_FillWramTileMapRectWithTileAndPalette
 
 	thumb_func_start bg_write_sequence_to_wram_tile_map_rect
-@ void bg_write_sequence_to_wram_tile_map_rect(u8 bg_id, s16 first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette, u16 tile_num_inc_amount)
-bg_write_sequence_to_wram_tile_map_rect: @ 8002840
+; void bg_write_sequence_to_wram_tile_map_rect(u8 bg_id, s16 first_tile_num, u8 tilemap_x, u8 tilemap_y, u8 width_in_tiles, u8 height_in_tiles, u8 palette, u16 tile_num_inc_amount)
+bg_write_sequence_to_wram_tile_map_rect: ; 8002840
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -2940,15 +2940,15 @@ bg_write_sequence_to_wram_tile_map_rect: @ 8002840
 	mov r0, r9
 	bl is_invalid_bg_id_2
 	cmp r0, 0
-	beq _0800288E
-	b _080029D4
-_0800288E:
+	beq @0800288E
+	b @080029D4
+@0800288E:
 	mov r0, r9
 	bl IsTileMapOutsideWram
 	cmp r0, 0
-	beq _0800289A
-	b _080029D4
-_0800289A:
+	beq @0800289A
+	b @080029D4
+@0800289A:
 	mov r0, r9
 	movs r1, 0x4
 	bl gpu_bg_config_get_field
@@ -2970,30 +2970,30 @@ _0800289A:
 	mov r0, r9
 	bl bg_get_type_by_bg_id
 	cmp r0, 0
-	beq _080028D4
+	beq @080028D4
 	cmp r0, 0x1
-	beq _0800295C
-	b _080029D4
-_080028D4:
+	beq @0800295C
+	b @080029D4
+@080028D4:
 	adds r5, r7, 0
 	adds r0, r5, r4
 	cmp r5, r0
-	bge _080029D4
+	bge @080029D4
 	str r0, [sp, 0x24]
 	add r7, sp, 0x4
-_080028E0:
+@080028E0:
 	ldr r4, [sp, 0x8]
 	mov r1, r10
 	adds r0, r4, r1
 	adds r2, r5, 0x1
 	mov r8, r2
 	cmp r4, r0
-	bge _08002944
+	bge @08002944
 	mov r3, r9
 	lsls r1, r3, 4
 	ldr r0, =0x030008fc
 	adds r6, r1, r0
-_080028F6:
+@080028F6:
 	ldr r0, [sp, 0x18]
 	str r0, [sp]
 	adds r0, r4, 0
@@ -3030,18 +3030,18 @@ _080028F6:
 	ldr r0, [sp, 0x8]
 	add r0, r10
 	cmp r4, r0
-	blt _080028F6
-_08002944:
+	blt @080028F6
+@08002944:
 	mov r1, r8
 	lsls r0, r1, 16
 	lsrs r5, r0, 16
 	ldr r2, [sp, 0x24]
 	cmp r5, r2
-	blt _080028E0
-	b _080029D4
+	blt @080028E0
+	b @080029D4
 	.align 2, 0
 	.pool
-_0800295C:
+@0800295C:
 	mov r0, r9
 	movs r1, 0x1
 	bl bg_get_screen_size_in_affine_mode
@@ -3051,19 +3051,19 @@ _0800295C:
 	adds r5, r7, 0
 	adds r0, r5, r4
 	cmp r5, r0
-	bge _080029D4
+	bge @080029D4
 	str r0, [sp, 0x24]
 	mov r3, r9
 	lsls r3, 4
 	mov r12, r3
-_0800297A:
+@0800297A:
 	ldr r4, [sp, 0x8]
 	mov r7, r10
 	adds r0, r4, r7
 	adds r1, r5, 0x1
 	mov r8, r1
 	cmp r4, r0
-	bge _080029C8
+	bge @080029C8
 	ldr r2, =0x030008fc
 	add r2, r12
 	str r2, [sp, 0x28]
@@ -3077,7 +3077,7 @@ _0800297A:
 	ldr r7, =0x000003ff
 	adds r5, r7, 0
 	adds r6, r0, 0
-_080029A2:
+@080029A2:
 	ldr r0, [sp, 0x28]
 	ldr r1, [r0]
 	adds r0, r3, r4
@@ -3096,15 +3096,15 @@ _080029A2:
 	lsls r0, 16
 	lsrs r4, r0, 16
 	cmp r4, r6
-	blt _080029A2
-_080029C8:
+	blt @080029A2
+@080029C8:
 	mov r1, r8
 	lsls r0, r1, 16
 	lsrs r5, r0, 16
 	ldr r2, [sp, 0x24]
 	cmp r5, r2
-	blt _0800297A
-_080029D4:
+	blt @0800297A
+@080029D4:
 	add sp, 0x2C
 	pop {r3-r5}
 	mov r8, r3
@@ -3118,8 +3118,8 @@ _080029D4:
 	thumb_func_end bg_write_sequence_to_wram_tile_map_rect
 
 	thumb_func_start bg_get_screen_size_in_regular_mode
-@ int bg_get_screen_size_in_regular_mode(u8 bg_id, int mode)
-bg_get_screen_size_in_regular_mode: @ 80029EC
+; int bg_get_screen_size_in_regular_mode(u8 bg_id, int mode)
+bg_get_screen_size_in_regular_mode: ; 80029EC
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3131,65 +3131,65 @@ bg_get_screen_size_in_regular_mode: @ 80029EC
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x1
-	beq _08002A2C
+	beq @08002A2C
 	cmp r4, 0x1
-	bgt _08002A10
+	bgt @08002A10
 	cmp r4, 0
-	beq _08002A16
-	b _08002A52
-_08002A10:
+	beq @08002A16
+	b @08002A52
+@08002A10:
 	cmp r5, 0x2
-	beq _08002A3E
-	b _08002A52
-_08002A16:
+	beq @08002A3E
+	b @08002A52
+@08002A16:
 	cmp r0, 0x2
-	bgt _08002A24
+	bgt @08002A24
 	cmp r0, 0x1
-	bge _08002A4E
-_08002A1E:
+	bge @08002A4E
+@08002A1E:
 	cmp r0, 0
-	beq _08002A46
-	b _08002A52
-_08002A24:
+	beq @08002A46
+	b @08002A52
+@08002A24:
 	cmp r0, 0x3
-	bne _08002A52
+	bne @08002A52
 	movs r0, 0x4
-	b _08002A54
-_08002A2C:
+	b @08002A54
+@08002A2C:
 	cmp r0, 0x1
-	beq _08002A4E
+	beq @08002A4E
 	cmp r0, 0x1
-	ble _08002A1E
+	ble @08002A1E
 	cmp r0, 0x2
-	beq _08002A46
+	beq @08002A46
 	cmp r0, 0x3
-	bne _08002A52
-	b _08002A4E
-_08002A3E:
+	bne @08002A52
+	b @08002A4E
+@08002A3E:
 	cmp r0, 0
-	blt _08002A52
+	blt @08002A52
 	cmp r0, 0x1
-	bgt _08002A4A
-_08002A46:
+	bgt @08002A4A
+@08002A46:
 	movs r0, 0x1
-	b _08002A54
-_08002A4A:
+	b @08002A54
+@08002A4A:
 	cmp r0, 0x3
-	bgt _08002A52
-_08002A4E:
+	bgt @08002A52
+@08002A4E:
 	movs r0, 0x2
-	b _08002A54
-_08002A52:
+	b @08002A54
+@08002A52:
 	movs r0, 0
-_08002A54:
+@08002A54:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
 	thumb_func_end bg_get_screen_size_in_regular_mode
 
 	thumb_func_start bg_get_screen_size_in_affine_mode
-@ int bg_get_screen_size_in_affine_mode(u8 bg_id, u8 a2)
-bg_get_screen_size_in_affine_mode: @ 8002A5C
+; int bg_get_screen_size_in_affine_mode(u8 bg_id, u8 a2)
+bg_get_screen_size_in_affine_mode: ; 8002A5C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -3201,51 +3201,51 @@ bg_get_screen_size_in_affine_mode: @ 8002A5C
 	lsrs r1, r0, 24
 	adds r0, r1, 0
 	cmp r4, 0
-	beq _08002A84
+	beq @08002A84
 	cmp r4, 0
-	blt _08002AAC
+	blt @08002AAC
 	cmp r4, 0x2
-	bgt _08002AAC
+	bgt @08002AAC
 	movs r0, 0x10
 	lsls r0, r1
-	b _08002AAE
-_08002A84:
+	b @08002AAE
+@08002A84:
 	cmp r1, 0x1
-	beq _08002AA0
+	beq @08002AA0
 	cmp r1, 0x1
-	bgt _08002A92
+	bgt @08002A92
 	cmp r1, 0
-	beq _08002A9C
-	b _08002AAC
-_08002A92:
+	beq @08002A9C
+	b @08002AAC
+@08002A92:
 	cmp r0, 0x2
-	beq _08002AA4
+	beq @08002AA4
 	cmp r0, 0x3
-	beq _08002AA8
-	b _08002AAC
-_08002A9C:
+	beq @08002AA8
+	b @08002AAC
+@08002A9C:
 	movs r0, 0x1
-	b _08002AAE
-_08002AA0:
+	b @08002AAE
+@08002AA0:
 	movs r0, 0x4
-	b _08002AAE
-_08002AA4:
+	b @08002AAE
+@08002AA4:
 	movs r0, 0x10
-	b _08002AAE
-_08002AA8:
+	b @08002AAE
+@08002AA8:
 	movs r0, 0x40
-	b _08002AAE
-_08002AAC:
+	b @08002AAE
+@08002AAC:
 	movs r0, 0
-_08002AAE:
+@08002AAE:
 	pop {r4}
 	pop {r1}
 	bx r1
 	thumb_func_end bg_get_screen_size_in_affine_mode
 
 	thumb_func_start bg_get_index_from_tile_coords
-@ int bg_get_index_from_tile_coords(int tilemap_x, int tilemap_y, int screen_size, int tilemap_w, int tilemap_h)
-bg_get_index_from_tile_coords: @ 8002AB4
+; int bg_get_index_from_tile_coords(int tilemap_x, int tilemap_y, int screen_size, int tilemap_w, int tilemap_h)
+bg_get_index_from_tile_coords: ; 8002AB4
 	push {r4,lr}
 	adds r4, r0, 0
 	ldr r0, [sp, 0x8]
@@ -3254,22 +3254,22 @@ bg_get_index_from_tile_coords: @ 8002AB4
 	subs r0, 0x1
 	ands r1, r0
 	cmp r2, 0x1
-	beq _08002AD8
+	beq @08002AD8
 	cmp r2, 0x1
-	ble _08002AE0
+	ble @08002AE0
 	cmp r2, 0x2
-	beq _08002AE0
+	beq @08002AE0
 	cmp r2, 0x3
-	bne _08002AE0
+	bne @08002AE0
 	cmp r1, 0x1F
-	ble _08002AD8
+	ble @08002AD8
 	adds r1, 0x20
-_08002AD8:
+@08002AD8:
 	cmp r4, 0x1F
-	ble _08002AE0
+	ble @08002AE0
 	subs r4, 0x20
 	adds r1, 0x20
-_08002AE0:
+@08002AE0:
 	lsls r0, r1, 5
 	adds r0, r4
 	pop {r4}
@@ -3278,18 +3278,18 @@ _08002AE0:
 	thumb_func_end bg_get_index_from_tile_coords
 
 	thumb_func_start bg_copy_tilemap_entry_not_rotscale_mode
-@ void bg_copy_tilemap_entry_not_rotscale_mode(u16 *tile_src, u16 *tile_dest, signed int palette, s16 a4, int a5)
-bg_copy_tilemap_entry_not_rotscale_mode: @ 8002AEC
+; void bg_copy_tilemap_entry_not_rotscale_mode(u16 *tile_src, u16 *tile_dest, signed int palette, s16 a4, int a5)
+bg_copy_tilemap_entry_not_rotscale_mode: ; 8002AEC
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
 	ldr r5, [sp, 0x10]
 	cmp r2, 0x10
-	beq _08002B14
+	beq @08002B14
 	cmp r2, 0x10
-	bgt _08002B34
+	bgt @08002B34
 	cmp r2, 0
-	blt _08002B34
+	blt @08002B34
 	ldrh r0, [r4]
 	adds r0, r3
 	ldr r3, =0x00000fff
@@ -3297,10 +3297,10 @@ bg_copy_tilemap_entry_not_rotscale_mode: @ 8002AEC
 	ands r0, r1
 	adds r1, r2, r5
 	lsls r1, 12
-	b _08002B3A
+	b @08002B3A
 	.align 2, 0
 	.pool
-_08002B14:
+@08002B14:
 	ldrh r1, [r6]
 	movs r0, 0xFC
 	lsls r0, 8
@@ -3313,16 +3313,16 @@ _08002B14:
 	adds r1, r3, 0
 	ands r0, r1
 	orrs r0, r2
-	b _08002B3C
+	b @08002B3C
 	.align 2, 0
 	.pool
-_08002B34:
+@08002B34:
 	ldrh r0, [r4]
 	adds r0, r3
 	lsls r1, r5, 12
-_08002B3A:
+@08002B3A:
 	adds r0, r1
-_08002B3C:
+@08002B3C:
 	lsls r0, 16
 	lsrs r1, r0, 16
 	strh r1, [r6]
@@ -3332,8 +3332,8 @@ _08002B3C:
 	thumb_func_end bg_copy_tilemap_entry_not_rotscale_mode
 
 	thumb_func_start bg_get_type_by_bg_id
-@ u16 bg_get_type_by_bg_id(u8 bg_id)
-bg_get_type_by_bg_id: @ 8002B48
+; u16 bg_get_type_by_bg_id(u8 bg_id)
+bg_get_type_by_bg_id: ; 8002B48
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3342,40 +3342,40 @@ bg_get_type_by_bg_id: @ 8002B48
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, 0x2
-	beq _08002B76
+	beq @08002B76
 	cmp r4, 0x2
-	ble _08002B66
+	ble @08002B66
 	cmp r4, 0x3
-	beq _08002B86
-	b _08002B8E
-_08002B66:
+	beq @08002B86
+	b @08002B8E
+@08002B66:
 	cmp r5, 0
-	blt _08002B8E
+	blt @08002B8E
 	cmp r0, 0x1
-	bgt _08002B8E
+	bgt @08002B8E
 	cmp r0, 0
-	blt _08002B8E
-_08002B72:
+	blt @08002B8E
+@08002B72:
 	movs r0, 0
-	b _08002B90
-_08002B76:
+	b @08002B90
+@08002B76:
 	cmp r0, 0
-	beq _08002B72
+	beq @08002B72
 	cmp r0, 0
-	blt _08002B8E
+	blt @08002B8E
 	cmp r0, 0x2
-	bgt _08002B8E
-_08002B82:
+	bgt @08002B8E
+@08002B82:
 	movs r0, 0x1
-	b _08002B90
-_08002B86:
+	b @08002B90
+@08002B86:
 	cmp r0, 0
-	beq _08002B72
+	beq @08002B72
 	cmp r0, 0x2
-	beq _08002B82
-_08002B8E:
+	beq @08002B82
+@08002B8E:
 	ldr r0, =0x0000ffff
-_08002B90:
+@08002B90:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
@@ -3384,25 +3384,25 @@ _08002B90:
 	thumb_func_end bg_get_type_by_bg_id
 
 	thumb_func_start is_invalid_bg_id_2
-@ int is_invalid_bg_id_2(u8 bg_id)
-is_invalid_bg_id_2: @ 8002B9C
+; int is_invalid_bg_id_2(u8 bg_id)
+is_invalid_bg_id_2: ; 8002B9C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
-	bhi _08002BAA
+	bhi @08002BAA
 	movs r0, 0
-	b _08002BAC
-_08002BAA:
+	b @08002BAC
+@08002BAA:
 	movs r0, 0x1
-_08002BAC:
+@08002BAC:
 	pop {r1}
 	bx r1
 	thumb_func_end is_invalid_bg_id_2
 
 	thumb_func_start IsTileMapOutsideWram
-@ bool IsTileMapOutsideWram(u8 bg_id)
-IsTileMapOutsideWram: @ 8002BB0
+; bool IsTileMapOutsideWram(u8 bg_id)
+IsTileMapOutsideWram: ; 8002BB0
 	push {lr}
 	lsls r0, 24
 	ldr r1, =0x030008f8
@@ -3412,16 +3412,16 @@ IsTileMapOutsideWram: @ 8002BB0
 	ldr r1, [r0]
 	ldr r0, =0x03008000
 	cmp r1, r0
-	bhi _08002BD4
+	bhi @08002BD4
 	cmp r1, 0
-	beq _08002BD4
+	beq @08002BD4
 	movs r0, 0
-	b _08002BD6
+	b @08002BD6
 	.align 2, 0
 	.pool
-_08002BD4:
+@08002BD4:
 	movs r0, 0x1
-_08002BD6:
+@08002BD6:
 	pop {r1}
 	bx r1
 	thumb_func_end IsTileMapOutsideWram